diff options
author | Damien Miller <djm@mindrot.org> | 2005-12-24 14:59:12 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-12-24 14:59:12 +1100 |
commit | 7bff1a9b5e6a0958ebc8201542eb6d359d987a1e (patch) | |
tree | 426c3ba6f792df129aa9f54da2814000d12a2675 | |
parent | 35978210462d089a53a3e4764b8fb21e1963acba (diff) |
- djm@cvs.openbsd.org 2005/12/24 02:27:41
[session.c sshd.c]
eliminate some code duplicated in privsep and non-privsep paths, and
explicitly clear SIGALRM handler; "groovy" deraadt@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | session.c | 11 | ||||
-rw-r--r-- | sshd.c | 20 |
3 files changed, 18 insertions, 19 deletions
@@ -43,6 +43,10 @@ | |||
43 | - jmc@cvs.openbsd.org 2005/12/23 23:46:23 | 43 | - jmc@cvs.openbsd.org 2005/12/23 23:46:23 |
44 | [ssh.1] | 44 | [ssh.1] |
45 | less mark up for -c; | 45 | less mark up for -c; |
46 | - djm@cvs.openbsd.org 2005/12/24 02:27:41 | ||
47 | [session.c sshd.c] | ||
48 | eliminate some code duplicated in privsep and non-privsep paths, and | ||
49 | explicitly clear SIGALRM handler; "groovy" deraadt@ | ||
46 | 50 | ||
47 | 20051220 | 51 | 20051220 |
48 | - (dtucker) OpenBSD CVS Sync | 52 | - (dtucker) OpenBSD CVS Sync |
@@ -3545,4 +3549,4 @@ | |||
3545 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3549 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3546 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3550 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3547 | 3551 | ||
3548 | $Id: ChangeLog,v 1.4050 2005/12/24 03:56:47 djm Exp $ | 3552 | $Id: ChangeLog,v 1.4051 2005/12/24 03:59:12 djm Exp $ |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.190 2005/12/17 21:13:05 stevesk Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.191 2005/12/24 02:27:41 djm Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -209,15 +209,6 @@ do_authenticated(Authctxt *authctxt) | |||
209 | { | 209 | { |
210 | setproctitle("%s", authctxt->pw->pw_name); | 210 | setproctitle("%s", authctxt->pw->pw_name); |
211 | 211 | ||
212 | /* | ||
213 | * Cancel the alarm we set to limit the time taken for | ||
214 | * authentication. | ||
215 | */ | ||
216 | alarm(0); | ||
217 | if (startup_pipe != -1) { | ||
218 | close(startup_pipe); | ||
219 | startup_pipe = -1; | ||
220 | } | ||
221 | /* setup the channel layer */ | 212 | /* setup the channel layer */ |
222 | if (!no_port_forwarding_flag && options.allow_tcp_forwarding) | 213 | if (!no_port_forwarding_flag && options.allow_tcp_forwarding) |
223 | channel_permit_all_opens(); | 214 | channel_permit_all_opens(); |
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.317 2005/10/30 08:52:18 djm Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.318 2005/12/24 02:27:41 djm Exp $"); |
46 | 46 | ||
47 | #include <openssl/dh.h> | 47 | #include <openssl/dh.h> |
48 | #include <openssl/bn.h> | 48 | #include <openssl/bn.h> |
@@ -637,13 +637,6 @@ privsep_postauth(Authctxt *authctxt) | |||
637 | goto skip; | 637 | goto skip; |
638 | } | 638 | } |
639 | 639 | ||
640 | /* Authentication complete */ | ||
641 | alarm(0); | ||
642 | if (startup_pipe != -1) { | ||
643 | close(startup_pipe); | ||
644 | startup_pipe = -1; | ||
645 | } | ||
646 | |||
647 | /* New socket pair */ | 640 | /* New socket pair */ |
648 | monitor_reinit(pmonitor); | 641 | monitor_reinit(pmonitor); |
649 | 642 | ||
@@ -1732,6 +1725,17 @@ main(int ac, char **av) | |||
1732 | } | 1725 | } |
1733 | 1726 | ||
1734 | authenticated: | 1727 | authenticated: |
1728 | /* | ||
1729 | * Cancel the alarm we set to limit the time taken for | ||
1730 | * authentication. | ||
1731 | */ | ||
1732 | alarm(0); | ||
1733 | signal(SIGALRM, SIG_DFL); | ||
1734 | if (startup_pipe != -1) { | ||
1735 | close(startup_pipe); | ||
1736 | startup_pipe = -1; | ||
1737 | } | ||
1738 | |||
1735 | #ifdef SSH_AUDIT_EVENTS | 1739 | #ifdef SSH_AUDIT_EVENTS |
1736 | audit_event(SSH_AUTH_SUCCESS); | 1740 | audit_event(SSH_AUTH_SUCCESS); |
1737 | #endif | 1741 | #endif |