tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 09:14:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/11/09 18:59:23

Browse Source 
[clientloop.c serverloop.c]
     don't memset too much memory, ok millert@
     original patch from jlk@kamens.brookline.ma.us via nalin@redhat.com
This commit is contained in:
Damien Miller 2001-11-12 11:06:32 +11:00
parent f655207a46
commit 79faeff2c1
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -54,6 +54,10 @@
Accepted publickey for ROOT from 127.0.0.1 port 42734 ssh2 Accepted publickey for ROOT from 127.0.0.1 port 42734 ssh2
becomes becomes
Accepted publickey for root from 127.0.0.1 port 42734 ssh2 Accepted publickey for root from 127.0.0.1 port 42734 ssh2
- markus@cvs.openbsd.org 2001/11/09 18:59:23
[clientloop.c serverloop.c]
don't memset too much memory, ok millert@
original patch from jlk@kamens.brookline.ma.us via nalin@redhat.com
20011109 20011109
- (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK)
@ -6863,4 +6867,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1650 2001/11/12 00:06:06 djm Exp $ $Id: ChangeLog,v 1.1651 2001/11/12 00:06:32 djm Exp $

10
clientloop.c
View File

@ -59,7 +59,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: clientloop.c,v 1.86 2001/10/24 19:57:40 markus Exp $"); RCSID("$OpenBSD: clientloop.c,v 1.87 2001/11/09 18:59:23 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -346,8 +346,8 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
if (session_closed && !channel_still_open() && if (session_closed && !channel_still_open() &&
!packet_have_data_to_write()) { !packet_have_data_to_write()) {
/* clear mask since we did not call select() */ /* clear mask since we did not call select() */
memset(*readsetp, 0, *maxfdp); memset(*readsetp, 0, *nallocp);
memset(*writesetp, 0, *maxfdp); memset(*writesetp, 0, *nallocp);
return; return;
} else { } else {
FD_SET(connection_in, *readsetp); FD_SET(connection_in, *readsetp);
@ -375,8 +375,8 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
* We have to return, because the mainloop checks for the flags * We have to return, because the mainloop checks for the flags
* set by the signal handlers. * set by the signal handlers.
*/ */
memset(*readsetp, 0, *maxfdp); memset(*readsetp, 0, *nallocp);
memset(*writesetp, 0, *maxfdp); memset(*writesetp, 0, *nallocp);
if (errno == EINTR) if (errno == EINTR)
return; return;

6
serverloop.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: serverloop.c,v 1.82 2001/10/10 22:18:47 markus Exp $"); RCSID("$OpenBSD: serverloop.c,v 1.83 2001/11/09 18:59:23 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "packet.h" #include "packet.h"
@ -272,8 +272,8 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
ret = select((*maxfdp)+1, *readsetp, *writesetp, NULL, tvp); ret = select((*maxfdp)+1, *readsetp, *writesetp, NULL, tvp);
if (ret == -1) { if (ret == -1) {
memset(*readsetp, 0, *maxfdp); memset(*readsetp, 0, *nallocp);
memset(*writesetp, 0, *maxfdp); memset(*writesetp, 0, *nallocp);
if (errno != EINTR) if (errno != EINTR)
error("select: %.100s", strerror(errno)); error("select: %.100s", strerror(errno));
} else if (ret == 0 && client_alive_scheduled) } else if (ret == 0 && client_alive_scheduled)