RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Always use mysignal() for SIGALRM

This commit is contained in:
Damien Miller 2003-06-04 22:56:15 +10:00
parent cc685c1cbe
commit 0cbb9dea05
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -29,6 +29,7 @@
kill ssh process on receipt of signal; ok markus@
- (djm) Update to fix of bug #584: lock card before return.
From larsch@trustcenter.de
- (djm) Always use mysignal() for SIGALRM
20030603
- (djm) Replace setproctitle replacement with code derived from
@ -457,4 +458,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2780 2003/06/04 12:51:38 djm Exp $
$Id: ChangeLog,v 1.2781 2003/06/04 12:56:15 djm Exp $

5
progressmeter.c
View File

@ -72,6 +72,7 @@ RCSID("$OpenBSD: progressmeter.c,v 1.6 2003/04/07 21:58:05 millert Exp $");
#include "atomicio.h"
#include "progressmeter.h"
#include "misc.h"
/* Number of seconds before xfer considered "stalled". */
#define STALLTIME 5
@ -121,7 +122,7 @@ start_progress_meter(char *file, off_t filesize, off_t *counter)
lastsize = 0;
draw_progress_meter();
signal(SIGALRM, update_progress_meter);
mysignal(SIGALRM, update_progress_meter);
alarm(PROGRESSTIME);
}
@ -140,7 +141,7 @@ update_progress_meter(int ignore)
int save_errno = errno;
draw_progress_meter();
signal(SIGALRM, update_progress_meter);
mysignal(SIGALRM, update_progress_meter);
alarm(PROGRESSTIME);
errno = save_errno;
}

4
ssh-agent.c
View File

@ -962,7 +962,7 @@ check_parent_exists(int sig)
/* printf("Parent has died - Authentication agent exiting.\n"); */
cleanup_handler(sig); /* safe */
}
signal(SIGALRM, check_parent_exists);
mysignal(SIGALRM, check_parent_exists);
alarm(10);
errno = save_errno;
}
@ -1194,7 +1194,7 @@ skip:
fatal_add_cleanup(cleanup_socket, NULL);
new_socket(AUTH_SOCKET, sock);
if (ac > 0) {
signal(SIGALRM, check_parent_exists);
mysignal(SIGALRM, check_parent_exists);
alarm(10);
}
idtab_init();

4
sshd.c
View File

@ -1373,7 +1373,7 @@ main(int ac, char **av)
if ((options.protocol & SSH_PROTO_1) &&
key_used == 0) {
/* Schedule server key regeneration alarm. */
signal(SIGALRM, key_regeneration_alarm);
mysignal(SIGALRM, key_regeneration_alarm);
alarm(options.key_regeneration_time);
key_used = 1;
}
@ -1462,7 +1462,7 @@ main(int ac, char **av)
* mode; it is just annoying to have the server exit just when you
* are about to discover the bug.
*/
signal(SIGALRM, grace_alarm_handler);
mysignal(SIGALRM, grace_alarm_handler);
if (!debug_flag)
alarm(options.login_grace_time);