summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sftp.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f3dfbbbe..4087da24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20010410
+ - OpenBSD CVS Sync
+ - deraadt@cvs.openbsd.org 2001/04/08 20:52:55
+ [sftp.c]
+ do not modify an actual argv[] entry
+
20010409
- (stevesk) use setresgid() for setegid() if needed
- (stevesk) configure.in: typo
@@ -4966,4 +4972,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1087 2001/04/09 14:50:52 stevesk Exp $
+$Id: ChangeLog,v 1.1088 2001/04/10 02:40:17 mouring Exp $
diff --git a/sftp.c b/sftp.c
index 0fbde563..7849d949 100644
--- a/sftp.c
+++ b/sftp.c
@@ -24,7 +24,7 @@
#include "includes.h"
-RCSID("$OpenBSD: sftp.c,v 1.12 2001/04/05 10:42:54 markus Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.13 2001/04/08 20:52:55 deraadt Exp $");
/* XXX: commandline mode */
/* XXX: copy between two remote hosts (commandline) */
@@ -205,7 +205,7 @@ main(int argc, char **argv)
if (optind == argc || argc > (optind + 1))
usage();
- userhost = argv[optind];
+ userhost = xstrdup(argv[optind]);
if ((host = strchr(userhost, '@')) == NULL)
host = userhost;