From 9836cf8d717455f1bba2dfbf2e41f074fc6bac48 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 17 Dec 2003 16:30:06 +1100 Subject: [PATCH] - 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 --- ChangeLog | 5 ++++- ssh.c | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a86f092cb..d737c855d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ - markus@cvs.openbsd.org 2003/12/09 17:29:04 [sshd.c] 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 - (dtucker) OpenBSD CVS Sync @@ -1578,4 +1581,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.3141 2003/12/17 05:29:22 djm Exp $ +$Id: ChangeLog,v 1.3142 2003/12/17 05:30:06 djm Exp $ diff --git a/ssh.c b/ssh.c index d29ca37a9..222aaab7f 100644 --- a/ssh.c +++ b/ssh.c @@ -40,7 +40,7 @@ */ #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 #include @@ -205,7 +205,7 @@ main(int ac, char **av) int i, opt, exit_status; u_short fwd_port, fwd_host_port; char sfwd_port[6], sfwd_host_port[6]; - char *p, *cp, buf[256]; + char *p, *cp, *line, buf[256]; struct stat st; struct passwd *pw; int dummy; @@ -464,9 +464,11 @@ again: break; case 'o': dummy = 1; + line = xstrdup(optarg); if (process_config_line(&options, host ? host : "", - optarg, "command-line", 0, &dummy) != 0) + line, "command-line", 0, &dummy) != 0) exit(1); + xfree(line); break; case 's': subsystem_flag = 1;