summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-12-17 16:29:22 +1100
committerDamien Miller <djm@mindrot.org>2003-12-17 16:29:22 +1100
commitb9997192a71ae603500e80d52f3e4e24913b87da (patch)
tree4106dbb56f706c10c408b32ae4fc75eaf95fc484
parentb5820f40bf6c088b02106ef900c6608357834448 (diff)
- markus@cvs.openbsd.org 2003/12/09 17:29:04
[sshd.c] fix -o and HUP; ok henning@
-rw-r--r--ChangeLog5
-rw-r--r--sshd.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c99f53a13..a86f092cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
6 1) send a bogus channel request if we find a channel 6 1) send a bogus channel request if we find a channel
7 2) send a bogus global request if we don't have a channel 7 2) send a bogus global request if we don't have a channel
8 ok + test beck@ 8 ok + test beck@
9 - markus@cvs.openbsd.org 2003/12/09 17:29:04
10 [sshd.c]
11 fix -o and HUP; ok henning@
9 12
1020031209 1320031209
11 - (dtucker) OpenBSD CVS Sync 14 - (dtucker) OpenBSD CVS Sync
@@ -1575,4 +1578,4 @@
1575 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1578 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1576 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1579 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1577 1580
1578$Id: ChangeLog,v 1.3140 2003/12/17 05:27:32 djm Exp $ 1581$Id: ChangeLog,v 1.3141 2003/12/17 05:29:22 djm Exp $
diff --git a/sshd.c b/sshd.c
index b45bc0abc..50856317a 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.282 2003/12/02 17:01:15 markus Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.283 2003/12/09 17:29:04 markus Exp $");
46 46
47#include <openssl/dh.h> 47#include <openssl/dh.h>
48#include <openssl/bn.h> 48#include <openssl/bn.h>
@@ -800,6 +800,7 @@ main(int ac, char **av)
800 FILE *f; 800 FILE *f;
801 struct addrinfo *ai; 801 struct addrinfo *ai;
802 char ntop[NI_MAXHOST], strport[NI_MAXSERV]; 802 char ntop[NI_MAXHOST], strport[NI_MAXSERV];
803 char *line;
803 int listen_sock, maxfd; 804 int listen_sock, maxfd;
804 int startup_p[2]; 805 int startup_p[2];
805 int startups = 0; 806 int startups = 0;
@@ -908,9 +909,11 @@ main(int ac, char **av)
908 } 909 }
909 break; 910 break;
910 case 'o': 911 case 'o':
911 if (process_server_config_line(&options, optarg, 912 line = xstrdup(optarg);
913 if (process_server_config_line(&options, line,
912 "command-line", 0) != 0) 914 "command-line", 0) != 0)
913 exit(1); 915 exit(1);
916 xfree(line);
914 break; 917 break;
915 case '?': 918 case '?':
916 default: 919 default: