diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | serverloop.c | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -15,6 +15,10 @@ | |||
15 | - markus@cvs.openbsd.org 2012/12/05 15:42:52 | 15 | - markus@cvs.openbsd.org 2012/12/05 15:42:52 |
16 | [ssh-add.c] | 16 | [ssh-add.c] |
17 | prevent double-free of comment; ok djm@ | 17 | prevent double-free of comment; ok djm@ |
18 | - dtucker@cvs.openbsd.org 2012/12/07 01:51:35 | ||
19 | [serverloop.c] | ||
20 | Cast signal to int for logging. A no-op on openbsd (they're always ints) | ||
21 | but will prevent warnings in portable. ok djm@ | ||
18 | 22 | ||
19 | 20121205 | 23 | 20121205 |
20 | - (tim) [defines.h] Some platforms are missing ULLONG_MAX. Feedback djm@. | 24 | - (tim) [defines.h] Some platforms are missing ULLONG_MAX. Feedback djm@. |
diff --git a/serverloop.c b/serverloop.c index 14e60c6dc..e224bd08a 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: serverloop.c,v 1.163 2012/12/02 20:46:11 djm Exp $ */ | 1 | /* $OpenBSD: serverloop.c,v 1.164 2012/12/07 01:51:35 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -708,7 +708,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg) | |||
708 | &nalloc, max_time_milliseconds); | 708 | &nalloc, max_time_milliseconds); |
709 | 709 | ||
710 | if (received_sigterm) { | 710 | if (received_sigterm) { |
711 | logit("Exiting on signal %d", received_sigterm); | 711 | logit("Exiting on signal %d", (int)received_sigterm); |
712 | /* Clean up sessions, utmp, etc. */ | 712 | /* Clean up sessions, utmp, etc. */ |
713 | cleanup_exit(255); | 713 | cleanup_exit(255); |
714 | } | 714 | } |
@@ -858,7 +858,7 @@ server_loop2(Authctxt *authctxt) | |||
858 | &nalloc, 0); | 858 | &nalloc, 0); |
859 | 859 | ||
860 | if (received_sigterm) { | 860 | if (received_sigterm) { |
861 | logit("Exiting on signal %d", received_sigterm); | 861 | logit("Exiting on signal %d", (int)received_sigterm); |
862 | /* Clean up sessions, utmp, etc. */ | 862 | /* Clean up sessions, utmp, etc. */ |
863 | cleanup_exit(255); | 863 | cleanup_exit(255); |
864 | } | 864 | } |