diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2001-12-06 17:52:16 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-12-06 17:52:16 +0000 |
| commit | f8f065bc752ca0a448eb90fc8d60516f486dc4ff (patch) | |
| tree | 8c468686546dc8673d93c1e629f46c79d65391cc | |
| parent | d05487d1db230db5d55c217fac907a5694bd7dd5 (diff) | |
- 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | clientloop.c | 4 | ||||
| -rw-r--r-- | serverloop.c | 5 | ||||
| -rw-r--r-- | sshd.c | 4 |
4 files changed, 11 insertions, 7 deletions
@@ -50,6 +50,9 @@ - deraadt@cvs.openbsd.org 2001/12/02 02:08:32 [sftp-common.c] 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 - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c, @@ -6972,4 +6975,4 @@ - Wrote replacements for strlcpy and mkdtemp - 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 $ diff --git a/clientloop.c b/clientloop.c index fcd6afdf..76b8101f 100644 --- a/clientloop.c +++ b/clientloop.c @@ -59,7 +59,7 @@ */ #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 "ssh1.h" @@ -949,7 +949,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) if (received_signal) { if (in_non_blocking_mode) /* XXX */ leave_non_blocking(); - fatal("Killed by signal %d.", received_signal); + fatal("Killed by signal %d.", (int) received_signal); } /* diff --git a/serverloop.c b/serverloop.c index fd115415..fd051070 100644 --- a/serverloop.c +++ b/serverloop.c @@ -35,7 +35,7 @@ */ #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 "packet.h" @@ -266,7 +266,8 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp, tvp = &tv; } 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. */ ret = select((*maxfdp)+1, *readsetp, *writesetp, NULL, tvp); @@ -40,7 +40,7 @@ */ #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/bn.h> @@ -978,7 +978,7 @@ main(int ac, char **av) error("select: %.100s", strerror(errno)); if (received_sigterm) { log("Received signal %d; terminating.", - received_sigterm); + (int) received_sigterm); close_listen_socks(); unlink(options.pid_file); exit(255); |