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

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

diff --git a/ChangeLog b/ChangeLog
index b826759e5d61cd4dbf2bdd605d2ae5001c8052fc..dca689127b65c62912b06e31ed4a74eeb3fb5db4 100644 (file)
--- 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

diff --git a/sshd.c b/sshd.c
index b45bc0abc348b8bb1f4a54bfc9ce3e3d3efda16b..50856317ac29d0c0a7ef2e4ecfde3efb5bb808e6 100644 (file)
--- 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: