diff options
author | Damien Miller <djm@mindrot.org> | 2003-06-04 22:56:15 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-06-04 22:56:15 +1000 |
commit | 0cbb9dea050942c643f739b79d0d9f30d75da213 (patch) | |
tree | 4d563c716e9ecbf0ef3c7c3b2e872f7d87813483 | |
parent | cc685c1cbece3cd3ece00a41c41b9781662a01aa (diff) |
- (djm) Always use mysignal() for SIGALRM
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | progressmeter.c | 5 | ||||
-rw-r--r-- | ssh-agent.c | 4 | ||||
-rw-r--r-- | sshd.c | 4 |
4 files changed, 9 insertions, 7 deletions
@@ -29,6 +29,7 @@ | |||
29 | kill ssh process on receipt of signal; ok markus@ | 29 | kill ssh process on receipt of signal; ok markus@ |
30 | - (djm) Update to fix of bug #584: lock card before return. | 30 | - (djm) Update to fix of bug #584: lock card before return. |
31 | From larsch@trustcenter.de | 31 | From larsch@trustcenter.de |
32 | - (djm) Always use mysignal() for SIGALRM | ||
32 | 33 | ||
33 | 20030603 | 34 | 20030603 |
34 | - (djm) Replace setproctitle replacement with code derived from | 35 | - (djm) Replace setproctitle replacement with code derived from |
@@ -457,4 +458,4 @@ | |||
457 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 458 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
458 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 459 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
459 | 460 | ||
460 | $Id: ChangeLog,v 1.2780 2003/06/04 12:51:38 djm Exp $ | 461 | $Id: ChangeLog,v 1.2781 2003/06/04 12:56:15 djm Exp $ |
diff --git a/progressmeter.c b/progressmeter.c index 343e1b7d5..d4abf2fd9 100644 --- a/progressmeter.c +++ b/progressmeter.c | |||
@@ -72,6 +72,7 @@ RCSID("$OpenBSD: progressmeter.c,v 1.6 2003/04/07 21:58:05 millert Exp $"); | |||
72 | 72 | ||
73 | #include "atomicio.h" | 73 | #include "atomicio.h" |
74 | #include "progressmeter.h" | 74 | #include "progressmeter.h" |
75 | #include "misc.h" | ||
75 | 76 | ||
76 | /* Number of seconds before xfer considered "stalled". */ | 77 | /* Number of seconds before xfer considered "stalled". */ |
77 | #define STALLTIME 5 | 78 | #define STALLTIME 5 |
@@ -121,7 +122,7 @@ start_progress_meter(char *file, off_t filesize, off_t *counter) | |||
121 | lastsize = 0; | 122 | lastsize = 0; |
122 | 123 | ||
123 | draw_progress_meter(); | 124 | draw_progress_meter(); |
124 | signal(SIGALRM, update_progress_meter); | 125 | mysignal(SIGALRM, update_progress_meter); |
125 | alarm(PROGRESSTIME); | 126 | alarm(PROGRESSTIME); |
126 | } | 127 | } |
127 | 128 | ||
@@ -140,7 +141,7 @@ update_progress_meter(int ignore) | |||
140 | int save_errno = errno; | 141 | int save_errno = errno; |
141 | 142 | ||
142 | draw_progress_meter(); | 143 | draw_progress_meter(); |
143 | signal(SIGALRM, update_progress_meter); | 144 | mysignal(SIGALRM, update_progress_meter); |
144 | alarm(PROGRESSTIME); | 145 | alarm(PROGRESSTIME); |
145 | errno = save_errno; | 146 | errno = save_errno; |
146 | } | 147 | } |
diff --git a/ssh-agent.c b/ssh-agent.c index c179ceaa2..fbd41834e 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -962,7 +962,7 @@ check_parent_exists(int sig) | |||
962 | /* printf("Parent has died - Authentication agent exiting.\n"); */ | 962 | /* printf("Parent has died - Authentication agent exiting.\n"); */ |
963 | cleanup_handler(sig); /* safe */ | 963 | cleanup_handler(sig); /* safe */ |
964 | } | 964 | } |
965 | signal(SIGALRM, check_parent_exists); | 965 | mysignal(SIGALRM, check_parent_exists); |
966 | alarm(10); | 966 | alarm(10); |
967 | errno = save_errno; | 967 | errno = save_errno; |
968 | } | 968 | } |
@@ -1194,7 +1194,7 @@ skip: | |||
1194 | fatal_add_cleanup(cleanup_socket, NULL); | 1194 | fatal_add_cleanup(cleanup_socket, NULL); |
1195 | new_socket(AUTH_SOCKET, sock); | 1195 | new_socket(AUTH_SOCKET, sock); |
1196 | if (ac > 0) { | 1196 | if (ac > 0) { |
1197 | signal(SIGALRM, check_parent_exists); | 1197 | mysignal(SIGALRM, check_parent_exists); |
1198 | alarm(10); | 1198 | alarm(10); |
1199 | } | 1199 | } |
1200 | idtab_init(); | 1200 | idtab_init(); |
@@ -1373,7 +1373,7 @@ main(int ac, char **av) | |||
1373 | if ((options.protocol & SSH_PROTO_1) && | 1373 | if ((options.protocol & SSH_PROTO_1) && |
1374 | key_used == 0) { | 1374 | key_used == 0) { |
1375 | /* Schedule server key regeneration alarm. */ | 1375 | /* Schedule server key regeneration alarm. */ |
1376 | signal(SIGALRM, key_regeneration_alarm); | 1376 | mysignal(SIGALRM, key_regeneration_alarm); |
1377 | alarm(options.key_regeneration_time); | 1377 | alarm(options.key_regeneration_time); |
1378 | key_used = 1; | 1378 | key_used = 1; |
1379 | } | 1379 | } |
@@ -1462,7 +1462,7 @@ main(int ac, char **av) | |||
1462 | * mode; it is just annoying to have the server exit just when you | 1462 | * mode; it is just annoying to have the server exit just when you |
1463 | * are about to discover the bug. | 1463 | * are about to discover the bug. |
1464 | */ | 1464 | */ |
1465 | signal(SIGALRM, grace_alarm_handler); | 1465 | mysignal(SIGALRM, grace_alarm_handler); |
1466 | if (!debug_flag) | 1466 | if (!debug_flag) |
1467 | alarm(options.login_grace_time); | 1467 | alarm(options.login_grace_time); |
1468 | 1468 | ||