- markus@cvs.openbsd.org 2003/12/09 17:29:04

     [sshd.c]
     fix -o and HUP; ok henning@

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 @@
      1) send a bogus channel request if we find a channel
      2) send a bogus global request if we don't have a channel
      ok + test beck@
+   - markus@cvs.openbsd.org 2003/12/09 17:29:04
+     [sshd.c]
+     fix -o and HUP; ok henning@
 
 20031209
  - (dtucker) OpenBSD CVS Sync
@@ -1575,4 +1578,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3140 2003/12/17 05:27:32 djm Exp $
+$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 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.282 2003/12/02 17:01:15 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.283 2003/12/09 17:29:04 markus Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -800,6 +800,7 @@ main(int ac, char **av)
         FILE *f;
         struct addrinfo *ai;
         char ntop[NI_MAXHOST], strport[NI_MAXSERV];
+        char *line;
         int listen_sock, maxfd;
         int startup_p[2];
         int startups = 0;
@@ -908,9 +909,11 @@ main(int ac, char **av)
                         }
                         break;
                 case 'o':
-                        if (process_server_config_line(&options, optarg,
+                        line = xstrdup(optarg);
+                        if (process_server_config_line(&options, line,
                             "command-line", 0) != 0)
                                 exit(1);
+                        xfree(line);
                         break;
                 case '?':
                 default: