summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--clientloop.c6
-rw-r--r--serverloop.c4
-rw-r--r--sshd.c8
4 files changed, 13 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 3de7d354..6ad5647e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,9 @@
- stevesk@cvs.openbsd.org 2001/11/22 05:27:29
[ssh-keyscan.c]
don't use "\n" in fatal()
+ - markus@cvs.openbsd.org 2001/11/22 12:34:22
+ [clientloop.c serverloop.c sshd.c]
+ volatile sig_atomic_t
20011126
- (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c,
@@ -6951,4 +6954,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1675 2001/12/06 16:45:10 mouring Exp $
+$Id: ChangeLog,v 1.1676 2001/12/06 16:48:14 mouring Exp $
diff --git a/clientloop.c b/clientloop.c
index cbcb1d19..fcd6afdf 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.87 2001/11/09 18:59:23 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.88 2001/11/22 12:34:22 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -101,8 +101,8 @@ extern char *host;
* window size to be sent to the server a little later. This is volatile
* because this is updated in a signal handler.
*/
-static volatile int received_window_change_signal = 0;
-static volatile int received_signal = 0;
+static volatile sig_atomic_t received_window_change_signal = 0;
+static volatile sig_atomic_t received_signal = 0;
/* Flag indicating whether the user\'s terminal is in non-blocking mode. */
static int in_non_blocking_mode = 0;
diff --git a/serverloop.c b/serverloop.c
index 0da805f0..fd115415 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.83 2001/11/09 18:59:23 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.84 2001/11/22 12:34:22 markus Exp $");
#include "xmalloc.h"
#include "packet.h"
@@ -87,7 +87,7 @@ static int client_alive_timeouts = 0;
* will exit after that, as soon as forwarded connections have terminated.
*/
-static volatile int child_terminated; /* The child has terminated. */
+static volatile sig_atomic_t child_terminated = 0; /* The child has terminated. */
/* prototypes */
static void server_init_dispatch(void);
diff --git a/sshd.c b/sshd.c
index dc4f5232..5a09598c 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.211 2001/11/19 11:20:21 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.212 2001/11/22 12:34:22 markus Exp $");
#include <openssl/dh.h>
#include <openssl/bn.h>
@@ -169,11 +169,11 @@ struct {
* Flag indicating whether the RSA server key needs to be regenerated.
* Is set in the SIGALRM handler and cleared when the key is regenerated.
*/
-int key_do_regen = 0;
+static volatile sig_atomic_t key_do_regen = 0;
/* This is set to true when a signal is received. */
-int received_sighup = 0;
-int received_sigterm = 0;
+static volatile sig_atomic_t received_sighup = 0;
+static volatile sig_atomic_t received_sigterm = 0;
/* session identifier, used by RSA-auth */
u_char session_id[16];