diff options
-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 @@ | |||
50 | - deraadt@cvs.openbsd.org 2001/12/02 02:08:32 | 50 | - deraadt@cvs.openbsd.org 2001/12/02 02:08:32 |
51 | [sftp-common.c] | 51 | [sftp-common.c] |
52 | zap }; | 52 | zap }; |
53 | - itojun@cvs.openbsd.org 2001/12/05 03:50:01 | ||
54 | [clientloop.c serverloop.c sshd.c] | ||
55 | deal with LP64 printf issue with sig_atomic_t. from thorpej | ||
53 | 56 | ||
54 | 20011126 | 57 | 20011126 |
55 | - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c, | 58 | - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c, |
@@ -6972,4 +6975,4 @@ | |||
6972 | - Wrote replacements for strlcpy and mkdtemp | 6975 | - Wrote replacements for strlcpy and mkdtemp |
6973 | - Released 1.0pre1 | 6976 | - Released 1.0pre1 |
6974 | 6977 | ||
6975 | $Id: ChangeLog,v 1.1681 2001/12/06 17:50:03 mouring Exp $ | 6978 | $Id: ChangeLog,v 1.1682 2001/12/06 17:52:16 mouring Exp $ |
diff --git a/clientloop.c b/clientloop.c index fcd6afdf6..76b8101fe 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -59,7 +59,7 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.88 2001/11/22 12:34:22 markus Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.89 2001/12/05 03:50:01 itojun Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -949,7 +949,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | |||
949 | if (received_signal) { | 949 | if (received_signal) { |
950 | if (in_non_blocking_mode) /* XXX */ | 950 | if (in_non_blocking_mode) /* XXX */ |
951 | leave_non_blocking(); | 951 | leave_non_blocking(); |
952 | fatal("Killed by signal %d.", received_signal); | 952 | fatal("Killed by signal %d.", (int) received_signal); |
953 | } | 953 | } |
954 | 954 | ||
955 | /* | 955 | /* |
diff --git a/serverloop.c b/serverloop.c index fd1154157..fd051070d 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: serverloop.c,v 1.84 2001/11/22 12:34:22 markus Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.85 2001/12/05 03:50:01 itojun Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "packet.h" | 41 | #include "packet.h" |
@@ -266,7 +266,8 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp, | |||
266 | tvp = &tv; | 266 | tvp = &tv; |
267 | } | 267 | } |
268 | if (tvp!=NULL) | 268 | if (tvp!=NULL) |
269 | debug3("tvp!=NULL kid %d mili %d", child_terminated, max_time_milliseconds); | 269 | debug3("tvp!=NULL kid %d mili %d", (int) child_terminated, |
270 | max_time_milliseconds); | ||
270 | 271 | ||
271 | /* Wait for something to happen, or the timeout to expire. */ | 272 | /* Wait for something to happen, or the timeout to expire. */ |
272 | ret = select((*maxfdp)+1, *readsetp, *writesetp, NULL, tvp); | 273 | ret = select((*maxfdp)+1, *readsetp, *writesetp, NULL, tvp); |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.212 2001/11/22 12:34:22 markus Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.213 2001/12/05 03:50:01 itojun Exp $"); |
44 | 44 | ||
45 | #include <openssl/dh.h> | 45 | #include <openssl/dh.h> |
46 | #include <openssl/bn.h> | 46 | #include <openssl/bn.h> |
@@ -978,7 +978,7 @@ main(int ac, char **av) | |||
978 | error("select: %.100s", strerror(errno)); | 978 | error("select: %.100s", strerror(errno)); |
979 | if (received_sigterm) { | 979 | if (received_sigterm) { |
980 | log("Received signal %d; terminating.", | 980 | log("Received signal %d; terminating.", |
981 | received_sigterm); | 981 | (int) received_sigterm); |
982 | close_listen_socks(); | 982 | close_listen_socks(); |
983 | unlink(options.pid_file); | 983 | unlink(options.pid_file); |
984 | exit(255); | 984 | exit(255); |