[ssh.c]
     don't modify argv for ssh -o; similar to sshd.c 1.283
This commit is contained in:
Damien Miller 2003-12-17 16:30:06 +11:00
parent b9997192a7
commit 9836cf8d71
2 changed files with 9 additions and 4 deletions

View File

@ -9,6 +9,9 @@
- markus@cvs.openbsd.org 2003/12/09 17:29:04 - markus@cvs.openbsd.org 2003/12/09 17:29:04
[sshd.c] [sshd.c]
fix -o and HUP; ok henning@ fix -o and HUP; ok henning@
- markus@cvs.openbsd.org 2003/12/09 17:30:05
[ssh.c]
don't modify argv for ssh -o; similar to sshd.c 1.283
20031209 20031209
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
@ -1578,4 +1581,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.3141 2003/12/17 05:29:22 djm Exp $ $Id: ChangeLog,v 1.3142 2003/12/17 05:30:06 djm Exp $

8
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.204 2003/11/24 00:16:35 dtucker Exp $"); RCSID("$OpenBSD: ssh.c,v 1.205 2003/12/09 17:30:05 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -205,7 +205,7 @@ main(int ac, char **av)
int i, opt, exit_status; int i, opt, exit_status;
u_short fwd_port, fwd_host_port; u_short fwd_port, fwd_host_port;
char sfwd_port[6], sfwd_host_port[6]; char sfwd_port[6], sfwd_host_port[6];
char *p, *cp, buf[256]; char *p, *cp, *line, buf[256];
struct stat st; struct stat st;
struct passwd *pw; struct passwd *pw;
int dummy; int dummy;
@ -464,9 +464,11 @@ again:
break; break;
case 'o': case 'o':
dummy = 1; dummy = 1;
line = xstrdup(optarg);
if (process_config_line(&options, host ? host : "", if (process_config_line(&options, host ? host : "",
optarg, "command-line", 0, &dummy) != 0) line, "command-line", 0, &dummy) != 0)
exit(1); exit(1);
xfree(line);
break; break;
case 's': case 's':
subsystem_flag = 1; subsystem_flag = 1;