diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -9,6 +9,9 @@ | |||
9 | - markus@cvs.openbsd.org 2003/12/09 17:29:04 | 9 | - markus@cvs.openbsd.org 2003/12/09 17:29:04 |
10 | [sshd.c] | 10 | [sshd.c] |
11 | fix -o and HUP; ok henning@ | 11 | fix -o and HUP; ok henning@ |
12 | - markus@cvs.openbsd.org 2003/12/09 17:30:05 | ||
13 | [ssh.c] | ||
14 | don't modify argv for ssh -o; similar to sshd.c 1.283 | ||
12 | 15 | ||
13 | 20031209 | 16 | 20031209 |
14 | - (dtucker) OpenBSD CVS Sync | 17 | - (dtucker) OpenBSD CVS Sync |
@@ -1578,4 +1581,4 @@ | |||
1578 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1581 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1579 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1582 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1580 | 1583 | ||
1581 | $Id: ChangeLog,v 1.3141 2003/12/17 05:29:22 djm Exp $ | 1584 | $Id: ChangeLog,v 1.3142 2003/12/17 05:30:06 djm Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.204 2003/11/24 00:16:35 dtucker Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.205 2003/12/09 17:30:05 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -205,7 +205,7 @@ main(int ac, char **av) | |||
205 | int i, opt, exit_status; | 205 | int i, opt, exit_status; |
206 | u_short fwd_port, fwd_host_port; | 206 | u_short fwd_port, fwd_host_port; |
207 | char sfwd_port[6], sfwd_host_port[6]; | 207 | char sfwd_port[6], sfwd_host_port[6]; |
208 | char *p, *cp, buf[256]; | 208 | char *p, *cp, *line, buf[256]; |
209 | struct stat st; | 209 | struct stat st; |
210 | struct passwd *pw; | 210 | struct passwd *pw; |
211 | int dummy; | 211 | int dummy; |
@@ -464,9 +464,11 @@ again: | |||
464 | break; | 464 | break; |
465 | case 'o': | 465 | case 'o': |
466 | dummy = 1; | 466 | dummy = 1; |
467 | line = xstrdup(optarg); | ||
467 | if (process_config_line(&options, host ? host : "", | 468 | if (process_config_line(&options, host ? host : "", |
468 | optarg, "command-line", 0, &dummy) != 0) | 469 | line, "command-line", 0, &dummy) != 0) |
469 | exit(1); | 470 | exit(1); |
471 | xfree(line); | ||
470 | break; | 472 | break; |
471 | case 's': | 473 | case 's': |
472 | subsystem_flag = 1; | 474 | subsystem_flag = 1; |