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 /session.c | |
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@
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 11 |
1 files changed, 1 insertions, 10 deletions
@@ -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(); |