- markus@cvs.openbsd.org 2003/06/29 12:44:38
[sshconnect.c] memset 0, not \0; andrushock@korovino.net
This commit is contained in:
parent
9f63f22aa0
commit
edeb1f7449
|
@ -9,6 +9,9 @@
|
||||||
progressmeter.c scp.c sftp-client.c ssh-keyscan.c ssh.h sshconnect.c
|
progressmeter.c scp.c sftp-client.c ssh-keyscan.c ssh.h sshconnect.c
|
||||||
sshd.c]
|
sshd.c]
|
||||||
deal with typing of write vs read in atomicio
|
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
|
20030630
|
||||||
- (djm) Search for support functions necessary to build our
|
- (djm) Search for support functions necessary to build our
|
||||||
|
@ -629,4 +632,4 @@
|
||||||
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
|
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
|
||||||
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
|
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 $
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#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 <openssl/bn.h>
|
#include <openssl/bn.h>
|
||||||
|
|
||||||
|
@ -246,7 +246,7 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr,
|
||||||
fdsetsz = howmany(sockfd + 1, NFDBITS) * sizeof(fd_mask);
|
fdsetsz = howmany(sockfd + 1, NFDBITS) * sizeof(fd_mask);
|
||||||
fdset = (fd_set *)xmalloc(fdsetsz);
|
fdset = (fd_set *)xmalloc(fdsetsz);
|
||||||
|
|
||||||
memset(fdset, '\0', fdsetsz);
|
memset(fdset, 0, fdsetsz);
|
||||||
FD_SET(sockfd, fdset);
|
FD_SET(sockfd, fdset);
|
||||||
tv.tv_sec = timeout;
|
tv.tv_sec = timeout;
|
||||||
tv.tv_usec = 0;
|
tv.tv_usec = 0;
|
||||||
|
|
Loading…
Reference in New Issue