summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--sftp.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 05cbba64a..5cd1d8f63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@
16 has been prematurely deleted. 16 has been prematurely deleted.
17 17
18 spotted by imorgan AT nas.nasa.gov 18 spotted by imorgan AT nas.nasa.gov
19 - djm@cvs.openbsd.org 2010/01/27 19:21:39
20 [sftp.c]
21 add missing "p" flag to getopt optstring;
22 bz#1704 from imorgan AT nas.nasa.gov
19 23
2020100126 2420100126
21 - (djm) OpenBSD CVS Sync 25 - (djm) OpenBSD CVS Sync
diff --git a/sftp.c b/sftp.c
index e01703ba9..d65d4ec62 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.122 2010/01/15 00:05:22 guenther Exp $ */ 1/* $OpenBSD: sftp.c,v 1.123 2010/01/27 19:21:39 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -2095,7 +2095,7 @@ main(int argc, char **argv)
2095 infile = stdin; 2095 infile = stdin;
2096 2096
2097 while ((ch = getopt(argc, argv, 2097 while ((ch = getopt(argc, argv,
2098 "1246hqrvCc:D:i:o:s:S:b:B:F:P:R:")) != -1) { 2098 "1246hpqrvCc:D:i:o:s:S:b:B:F:P:R:")) != -1) {
2099 switch (ch) { 2099 switch (ch) {
2100 /* Passed through to ssh(1) */ 2100 /* Passed through to ssh(1) */
2101 case '4': 2101 case '4':