diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-12-05 03:50:02 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-12-05 03:50:02 +0000 |
| commit | 22b580431f589fd295d6a9a2e00ec811350de7e0 (patch) | |
| tree | 0aad2ff5f2fbf99f2cc4e4daec34b333a3693462 /usr.bin | |
| parent | 4811bf0463edb4a73eeb7499b01b883b5b627d0b (diff) | |
deal with LP64 printf issue with sig_atomic_t. from thorpej
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/clientloop.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd.c | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index fcd6afdf6b4..76b8101fe81 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/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/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index 70097d73bb9..6a1f69c572f 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/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); diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 24854a32c2d..1a661550045 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -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> @@ -951,7 +951,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); |