diff options
author | Markus Friedl <markus@cvs.openbsd.org> | 2003-12-09 17:29:05 +0000 |
---|---|---|
committer | Markus Friedl <markus@cvs.openbsd.org> | 2003-12-09 17:29:05 +0000 |
commit | ae3dc55885c13e3afeef0c6170d628bca544e7f6 (patch) | |
tree | 0778c0c0505d1ecd5361b57095188cceb1b22aff /usr.bin/ssh | |
parent | f98c214600780d01ed3151a94e4a2f73f2954a13 (diff) |
fix -o and HUP; ok henning@
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r-- | usr.bin/ssh/sshd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index c46caf63969..383d4b90cfa 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/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> @@ -784,6 +784,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; @@ -876,9 +877,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: |