summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-07-11 18:15:50 +1000
committerDamien Miller <djm@mindrot.org>2000-07-11 18:15:50 +1000
commit4d97ba22570f1edebeed41ce33f7ca06475a173f (patch)
treeb2aa8206e983f0b76ac4b91b82780a38ca79e473
parent3702396526a2569402696ff7d7c6d0fe2e5a447b (diff)
- (djm) Fix problem with debug mode and MaxStartups
-rw-r--r--ChangeLog1
-rw-r--r--session.c6
-rw-r--r--sshd.c1
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8481359a7..b36f9a48d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,7 @@
49 - ho@cvs.openbsd.org 2000/07/10 10:30:25 49 - ho@cvs.openbsd.org 2000/07/10 10:30:25
50 [cipher.c kex.c servconf.c] 50 [cipher.c kex.c servconf.c]
51 strtok() --> strsep(). (niels@ ok) 51 strtok() --> strsep(). (niels@ ok)
52 - (djm) Fix problem with debug mode and MaxStartups
52 53
5320000709 5420000709
54 - (djm) Only enable PAM_TTY kludge for Linux. Problem report from 55 - (djm) Only enable PAM_TTY kludge for Linux. Problem report from
diff --git a/session.c b/session.c
index 96a2d3b52..abf3ef346 100644
--- a/session.c
+++ b/session.c
@@ -169,7 +169,8 @@ do_authenticated(struct passwd * pw)
169 * authentication. 169 * authentication.
170 */ 170 */
171 alarm(0); 171 alarm(0);
172 close(startup_pipe); 172 if (startup_pipe != -1)
173 close(startup_pipe);
173 174
174 /* 175 /*
175 * Inform the channel mechanism that we are the server side and that 176 * Inform the channel mechanism that we are the server side and that
@@ -1792,7 +1793,8 @@ do_authenticated2(void)
1792 * authentication. 1793 * authentication.
1793 */ 1794 */
1794 alarm(0); 1795 alarm(0);
1795 close(startup_pipe); 1796 if (startup_pipe != -1)
1797 close(startup_pipe);
1796 server_loop2(); 1798 server_loop2();
1797 if (xauthfile) 1799 if (xauthfile)
1798 xauthfile_cleanup_proc(NULL); 1800 xauthfile_cleanup_proc(NULL);
diff --git a/sshd.c b/sshd.c
index fc8b17b9e..e53629d4b 100644
--- a/sshd.c
+++ b/sshd.c
@@ -855,6 +855,7 @@ main(int ac, char **av)
855 sock_in = newsock; 855 sock_in = newsock;
856 sock_out = newsock; 856 sock_out = newsock;
857 pid = getpid(); 857 pid = getpid();
858 startup_pipe = -1;
858 break; 859 break;
859 } else { 860 } else {
860 /* 861 /*