ssh-add broken for latest snapshots

[Lutz Jaenicke]

On Tue, Oct 17, 2000 at 11:12:04PM +1100, Damien Miller wrote:
> On Tue, 17 Oct 2000, Lutz Jaenicke wrote:
> > I had some fight with ssh-add this morning that I have now tracked
> > down to a change recently made.  I run "ssh-add < /dev/null" to
> > launch (x11-)ssh-askpass from the CDE startup. Unfortunately, no
> > keys are added to ssh-agent!
> 
> Thanks again. Does this help:
> 
> diff -u -r1.25 ssh-add.c
> --- ssh-add.c	2000/09/30 10:36:54	1.25
> +++ ssh-add.c	2000/10/17 12:11:17
> @@ -117,7 +117,9 @@
>  		fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno));
>  	}
>  	close(p[1]);
> -	len = atomicio(read, p[0], buf, sizeof buf);
> +	buf[0] = '\0';
> +	atomicio(read, p[0], buf, sizeof buf);
> +	len = strlen(buf);
>  	close(p[0]);
>  	while (waitpid(pid, &status, 0) < 0)
>  		if (errno != EINTR)

Yes, this helps,
	Lutz
-- 
Lutz Jaenicke                             Lutz.Jaenicke at aet.TU-Cottbus.DE
BTU Cottbus               http://www.aet.TU-Cottbus.DE/personen/jaenicke/
Lehrstuhl Allgemeine Elektrotechnik                  Tel. +49 355 69-4129
Universitaetsplatz 3-4, D-03044 Cottbus              Fax. +49 355 69-4153