summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-07-12 09:45:27 +1000
committerDamien Miller <djm@mindrot.org>2000-07-12 09:45:27 +1000
commit182ee6e6d9b13f0a117a19bd4b9e3318a74233eb (patch)
tree016940bacc612da29db1b463cd0684f74796f697 /sshd.c
parentb2dc28e9c8584884fda5fb8bfef1125ecac78628 (diff)
- (djm) OpenBSD CVS Updates:
- deraadt@cvs.openbsd.org 2000/07/11 02:11:34 [session.c sshd.c ] make MaxStartups code still work with -d; djm - deraadt@cvs.openbsd.org 2000/07/11 13:17:45 [readconf.c ssh_config] disable FallBackToRsh by default
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index e53629d4b..cab0dd6f1 100644
--- a/sshd.c
+++ b/sshd.c
@@ -14,7 +14,7 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$OpenBSD: sshd.c,v 1.121 2000/07/05 21:35:56 provos Exp $"); 17RCSID("$OpenBSD: sshd.c,v 1.122 2000/07/11 08:11:34 deraadt Exp $");
18 18
19#include "xmalloc.h" 19#include "xmalloc.h"
20#include "rsa.h" 20#include "rsa.h"
@@ -854,8 +854,8 @@ main(int ac, char **av)
854 close_listen_socks(); 854 close_listen_socks();
855 sock_in = newsock; 855 sock_in = newsock;
856 sock_out = newsock; 856 sock_out = newsock;
857 pid = getpid();
858 startup_pipe = -1; 857 startup_pipe = -1;
858 pid = getpid();
859 break; 859 break;
860 } else { 860 } else {
861 /* 861 /*