summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-07-03 13:48:04 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-07-03 13:48:04 +1000
commitedeb1f74498db67636f231e8313cc56d4ff112ec (patch)
tree329b42a22dd1a407a2e18babcd78b8eaffe58c05
parent9f63f22aa0ab13673f197642a66a98b09a18abd0 (diff)
- markus@cvs.openbsd.org 2003/06/29 12:44:38
[sshconnect.c] memset 0, not \0; andrushock@korovino.net
-rw-r--r--ChangeLog5
-rw-r--r--sshconnect.c4
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 @@
9 progressmeter.c scp.c sftp-client.c ssh-keyscan.c ssh.h sshconnect.c 9 progressmeter.c scp.c sftp-client.c ssh-keyscan.c ssh.h sshconnect.c
10 sshd.c] 10 sshd.c]
11 deal with typing of write vs read in atomicio 11 deal with typing of write vs read in atomicio
12 - markus@cvs.openbsd.org 2003/06/29 12:44:38
13 [sshconnect.c]
14 memset 0, not \0; andrushock@korovino.net
12 15
1320030630 1620030630
14 - (djm) Search for support functions necessary to build our 17 - (djm) Search for support functions necessary to build our
@@ -629,4 +632,4 @@
629 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 632 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
630 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 633 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
631 634
632$Id: ChangeLog,v 1.2837 2003/07/03 03:46:56 dtucker Exp $ 635$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 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect.c,v 1.146 2003/06/28 16:23:06 deraadt Exp $"); 16RCSID("$OpenBSD: sshconnect.c,v 1.147 2003/06/29 12:44:38 markus Exp $");
17 17
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19 19
@@ -246,7 +246,7 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr,
246 fdsetsz = howmany(sockfd + 1, NFDBITS) * sizeof(fd_mask); 246 fdsetsz = howmany(sockfd + 1, NFDBITS) * sizeof(fd_mask);
247 fdset = (fd_set *)xmalloc(fdsetsz); 247 fdset = (fd_set *)xmalloc(fdsetsz);
248 248
249 memset(fdset, '\0', fdsetsz); 249 memset(fdset, 0, fdsetsz);
250 FD_SET(sockfd, fdset); 250 FD_SET(sockfd, fdset);
251 tv.tv_sec = timeout; 251 tv.tv_sec = timeout;
252 tv.tv_usec = 0; 252 tv.tv_usec = 0;