ssh-keyscan for ssh2 (was Re: openssh-2.9p1)

mouring at etoh.eviladmin.org mouring at etoh.eviladmin.org
Sat May 19 08:04:14 EST 2001



>  int
> -conrecycle(int s, int include_current_host)
> +conrecycle(int s)
>  {
>  	int ret;
>  	con *c = &fdcon[s];
>  	char *iname, *oname;
> -	int keytypes = c->c_keytypes;
> +	int keytype = c->c_keytype;
>
	^^^ Is this really needed any more?  It's used once.

> -	if (include_current_host) {
> -		iname = xmalloc(strlen(c->c_name) + strlen(c->c_namelist) + 2);
> -		strcpy(iname, c->c_name);
> -		if (*c->c_namelist)
> -			sprintf(iname + strlen(iname), ",%s", c->c_namelist);
> -	} else
> -		iname = xstrdup(c->c_namelist);
> +	iname = xstrdup(c->c_namelist);
>  	oname = xstrdup(c->c_output_name);
>  	confree(s);
> -	ret = conalloc(iname, oname, keytypes);
> +	ret = conalloc(iname, oname, keytype);
	^^^^^ ret = conalloc(iname, oname, c->c_keytype); instead?


Other then that.. Looks good to me.  Don't know if we want to move it to
-t {rsa1,rsa,dsa} instead of -1 -R -D.  Would that change -t [timeout] to
-T [timeout] ?

- Ben




More information about the openssh-unix-dev mailing list