summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-10 02:40:17 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-04-10 02:40:17 +0000
commit9492484a2781d8d2ed51ab0104942f2b80529a52 (patch)
tree2100926c42f5926bd80ac7612336766605cf5c32
parentcb17e99faeea6823a630b9769a1c8906ea0766b3 (diff)
- deraadt@cvs.openbsd.org 2001/04/08 20:52:55
[sftp.c] do not modify an actual argv[] entry
-rw-r--r--ChangeLog8
-rw-r--r--sftp.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f3dfbbbe5..4087da24f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120010410
2 - OpenBSD CVS Sync
3 - deraadt@cvs.openbsd.org 2001/04/08 20:52:55
4 [sftp.c]
5 do not modify an actual argv[] entry
6
120010409 720010409
2 - (stevesk) use setresgid() for setegid() if needed 8 - (stevesk) use setresgid() for setegid() if needed
3 - (stevesk) configure.in: typo 9 - (stevesk) configure.in: typo
@@ -4966,4 +4972,4 @@
4966 - Wrote replacements for strlcpy and mkdtemp 4972 - Wrote replacements for strlcpy and mkdtemp
4967 - Released 1.0pre1 4973 - Released 1.0pre1
4968 4974
4969$Id: ChangeLog,v 1.1087 2001/04/09 14:50:52 stevesk Exp $ 4975$Id: ChangeLog,v 1.1088 2001/04/10 02:40:17 mouring Exp $
diff --git a/sftp.c b/sftp.c
index 0fbde5634..7849d9491 100644
--- a/sftp.c
+++ b/sftp.c
@@ -24,7 +24,7 @@
24 24
25#include "includes.h" 25#include "includes.h"
26 26
27RCSID("$OpenBSD: sftp.c,v 1.12 2001/04/05 10:42:54 markus Exp $"); 27RCSID("$OpenBSD: sftp.c,v 1.13 2001/04/08 20:52:55 deraadt Exp $");
28 28
29/* XXX: commandline mode */ 29/* XXX: commandline mode */
30/* XXX: copy between two remote hosts (commandline) */ 30/* XXX: copy between two remote hosts (commandline) */
@@ -205,7 +205,7 @@ main(int argc, char **argv)
205 if (optind == argc || argc > (optind + 1)) 205 if (optind == argc || argc > (optind + 1))
206 usage(); 206 usage();
207 207
208 userhost = argv[optind]; 208 userhost = xstrdup(argv[optind]);
209 209
210 if ((host = strchr(userhost, '@')) == NULL) 210 if ((host = strchr(userhost, '@')) == NULL)
211 host = userhost; 211 host = userhost;