From edeb1f74498db67636f231e8313cc56d4ff112ec Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 3 Jul 2003 13:48:04 +1000 Subject: - markus@cvs.openbsd.org 2003/06/29 12:44:38 [sshconnect.c] memset 0, not \0; andrushock@korovino.net --- ChangeLog | 5 ++++- sshconnect.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fdfce197..ee5276502 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ progressmeter.c scp.c sftp-client.c ssh-keyscan.c ssh.h sshconnect.c sshd.c] deal with typing of write vs read in atomicio + - markus@cvs.openbsd.org 2003/06/29 12:44:38 + [sshconnect.c] + memset 0, not \0; andrushock@korovino.net 20030630 - (djm) Search for support functions necessary to build our @@ -629,4 +632,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2837 2003/07/03 03:46:56 dtucker Exp $ +$Id: ChangeLog,v 1.2838 2003/07/03 03:48:04 dtucker Exp $ diff --git a/sshconnect.c b/sshconnect.c index 364a62281..40d22800f 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.146 2003/06/28 16:23:06 deraadt Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.147 2003/06/29 12:44:38 markus Exp $"); #include @@ -246,7 +246,7 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr, fdsetsz = howmany(sockfd + 1, NFDBITS) * sizeof(fd_mask); fdset = (fd_set *)xmalloc(fdsetsz); - memset(fdset, '\0', fdsetsz); + memset(fdset, 0, fdsetsz); FD_SET(sockfd, fdset); tv.tv_sec = timeout; tv.tv_usec = 0; -- cgit v1.2.3