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

- itojun@cvs.openbsd.org 2001/12/05 03:50:01

Browse Source 
[clientloop.c serverloop.c sshd.c]
     deal with LP64 printf issue with sig_atomic_t.  from thorpej
This commit is contained in:
Ben Lindstrom 2001-12-06 17:52:16 +00:00
parent d05487d1db
commit f8f065bc75
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -50,6 +50,9 @@
- deraadt@cvs.openbsd.org 2001/12/02 02:08:32 - deraadt@cvs.openbsd.org 2001/12/02 02:08:32
[sftp-common.c] [sftp-common.c]
zap }; zap };
- itojun@cvs.openbsd.org 2001/12/05 03:50:01
[clientloop.c serverloop.c sshd.c]
deal with LP64 printf issue with sig_atomic_t. from thorpej
20011126 20011126
- (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c, - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c,
@ -6972,4 +6975,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1681 2001/12/06 17:50:03 mouring Exp $ $Id: ChangeLog,v 1.1682 2001/12/06 17:52:16 mouring Exp $

4
clientloop.c
View File

@ -59,7 +59,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: clientloop.c,v 1.88 2001/11/22 12:34:22 markus Exp $"); RCSID("$OpenBSD: clientloop.c,v 1.89 2001/12/05 03:50:01 itojun Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -949,7 +949,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
if (received_signal) { if (received_signal) {
if (in_non_blocking_mode) /* XXX */ if (in_non_blocking_mode) /* XXX */
leave_non_blocking(); leave_non_blocking();
fatal("Killed by signal %d.", received_signal); fatal("Killed by signal %d.", (int) received_signal);
} }
/* /*

5
serverloop.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: serverloop.c,v 1.84 2001/11/22 12:34:22 markus Exp $"); RCSID("$OpenBSD: serverloop.c,v 1.85 2001/12/05 03:50:01 itojun Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "packet.h" #include "packet.h"
@ -266,7 +266,8 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
tvp = &tv; tvp = &tv;
} }
if (tvp!=NULL) if (tvp!=NULL)
debug3("tvp!=NULL kid %d mili %d", child_terminated, max_time_milliseconds); debug3("tvp!=NULL kid %d mili %d", (int) child_terminated,
max_time_milliseconds);
/* Wait for something to happen, or the timeout to expire. */ /* Wait for something to happen, or the timeout to expire. */
ret = select((*maxfdp)+1, *readsetp, *writesetp, NULL, tvp); ret = select((*maxfdp)+1, *readsetp, *writesetp, NULL, tvp);

4
sshd.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshd.c,v 1.212 2001/11/22 12:34:22 markus Exp $"); RCSID("$OpenBSD: sshd.c,v 1.213 2001/12/05 03:50:01 itojun Exp $");
#include <openssl/dh.h> #include <openssl/dh.h>
#include <openssl/bn.h> #include <openssl/bn.h>
@ -978,7 +978,7 @@ main(int ac, char **av)
error("select: %.100s", strerror(errno)); error("select: %.100s", strerror(errno));
if (received_sigterm) { if (received_sigterm) {
log("Received signal %d; terminating.", log("Received signal %d; terminating.",
received_sigterm); (int) received_sigterm);
close_listen_socks(); close_listen_socks();
unlink(options.pid_file); unlink(options.pid_file);
exit(255); exit(255);