diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | auth.h | 4 | ||||
-rw-r--r-- | clientloop.c | 4 | ||||
-rw-r--r-- | dispatch.c | 4 | ||||
-rw-r--r-- | dispatch.h | 4 | ||||
-rw-r--r-- | kex.h | 4 |
6 files changed, 16 insertions, 11 deletions
@@ -47,6 +47,11 @@ | |||
47 | that sftp and sftp-server (which use the Buffer functions in bufaux.c | 47 | that sftp and sftp-server (which use the Buffer functions in bufaux.c |
48 | but not the bignum ones) no longer need to be linked with libcrypto. | 48 | but not the bignum ones) no longer need to be linked with libcrypto. |
49 | ok markus@ | 49 | ok markus@ |
50 | - djm@cvs.openbsd.org 2006/04/20 09:27:09 | ||
51 | [auth.h clientloop.c dispatch.c dispatch.h kex.h] | ||
52 | replace the last non-sig_atomic_t flag used in a signal handler with a | ||
53 | sig_atomic_t, unfortunately with some knock-on effects in other (non- | ||
54 | signal) contexts in which it is used; ok markus@ | ||
50 | 55 | ||
51 | 20060421 | 56 | 20060421 |
52 | - (djm) [Makefile.in configure.ac session.c sshpty.c] | 57 | - (djm) [Makefile.in configure.ac session.c sshpty.c] |
@@ -4558,4 +4563,4 @@ | |||
4558 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4563 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4559 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4564 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4560 | 4565 | ||
4561 | $Id: ChangeLog,v 1.4311 2006/04/23 02:08:19 djm Exp $ | 4566 | $Id: ChangeLog,v 1.4312 2006/04/23 02:08:37 djm Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.h,v 1.52 2006/03/25 22:22:42 djm Exp $ */ | 1 | /* $OpenBSD: auth.h,v 1.53 2006/04/20 09:27:09 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -48,7 +48,7 @@ typedef struct Authmethod Authmethod; | |||
48 | typedef struct KbdintDevice KbdintDevice; | 48 | typedef struct KbdintDevice KbdintDevice; |
49 | 49 | ||
50 | struct Authctxt { | 50 | struct Authctxt { |
51 | int success; | 51 | sig_atomic_t success; |
52 | int postponed; /* authentication needs another step */ | 52 | int postponed; /* authentication needs another step */ |
53 | int valid; /* user exists and is allowed to login */ | 53 | int valid; /* user exists and is allowed to login */ |
54 | int attempt; | 54 | int attempt; |
diff --git a/clientloop.c b/clientloop.c index 7745c4dd8..d317b79f4 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.161 2006/03/25 18:30:55 deraadt Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.162 2006/04/20 09:27:09 djm 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 |
@@ -131,7 +131,7 @@ static volatile sig_atomic_t received_signal = 0; | |||
131 | static int in_non_blocking_mode = 0; | 131 | static int in_non_blocking_mode = 0; |
132 | 132 | ||
133 | /* Common data for the client loop code. */ | 133 | /* Common data for the client loop code. */ |
134 | static int quit_pending; /* Set to non-zero to quit the client loop. */ | 134 | static volatile sig_atomic_t quit_pending; /* Set non-zero to quit the loop. */ |
135 | static int escape_char; /* Escape character. */ | 135 | static int escape_char; /* Escape character. */ |
136 | static int escape_pending; /* Last character was the escape character */ | 136 | static int escape_pending; /* Last character was the escape character */ |
137 | static int last_was_cr; /* Last character was a newline. */ | 137 | static int last_was_cr; /* Last character was a newline. */ |
diff --git a/dispatch.c b/dispatch.c index eac07b1b3..4f965a62d 100644 --- a/dispatch.c +++ b/dispatch.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dispatch.c,v 1.18 2006/03/25 13:17:01 djm Exp $ */ | 1 | /* $OpenBSD: dispatch.c,v 1.19 2006/04/20 09:27:09 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -76,7 +76,7 @@ dispatch_set(int type, dispatch_fn *fn) | |||
76 | dispatch[type] = fn; | 76 | dispatch[type] = fn; |
77 | } | 77 | } |
78 | void | 78 | void |
79 | dispatch_run(int mode, int *done, void *ctxt) | 79 | dispatch_run(int mode, volatile sig_atomic_t *done, void *ctxt) |
80 | { | 80 | { |
81 | for (;;) { | 81 | for (;;) { |
82 | int type; | 82 | int type; |
diff --git a/dispatch.h b/dispatch.h index b33288f66..4bca8a5a0 100644 --- a/dispatch.h +++ b/dispatch.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dispatch.h,v 1.10 2006/03/25 22:22:43 djm Exp $ */ | 1 | /* $OpenBSD: dispatch.h,v 1.11 2006/04/20 09:27:09 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -33,6 +33,6 @@ typedef void dispatch_fn(int, u_int32_t, void *); | |||
33 | void dispatch_init(dispatch_fn *); | 33 | void dispatch_init(dispatch_fn *); |
34 | void dispatch_set(int, dispatch_fn *); | 34 | void dispatch_set(int, dispatch_fn *); |
35 | void dispatch_range(u_int, u_int, dispatch_fn *); | 35 | void dispatch_range(u_int, u_int, dispatch_fn *); |
36 | void dispatch_run(int, int *, void *); | 36 | void dispatch_run(int, volatile sig_atomic_t *, void *); |
37 | void dispatch_protocol_error(int, u_int32_t, void *); | 37 | void dispatch_protocol_error(int, u_int32_t, void *); |
38 | void dispatch_protocol_ignore(int, u_int32_t, void *); | 38 | void dispatch_protocol_ignore(int, u_int32_t, void *); |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.41 2006/03/25 22:22:43 djm Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.42 2006/04/20 09:27:09 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -114,7 +114,7 @@ struct Kex { | |||
114 | int kex_type; | 114 | int kex_type; |
115 | Buffer my; | 115 | Buffer my; |
116 | Buffer peer; | 116 | Buffer peer; |
117 | int done; | 117 | sig_atomic_t done; |
118 | int flags; | 118 | int flags; |
119 | const EVP_MD *evp_md; | 119 | const EVP_MD *evp_md; |
120 | char *client_version_string; | 120 | char *client_version_string; |