summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-06-21 17:53:48 +1000
committerDarren Tucker <dtucker@zip.com.au>2009-06-21 17:53:48 +1000
commitb62f1a856d3dc0b6d091e013500aa65c6173e0e5 (patch)
tree435c3d3532188e687594409e7567ffd6d821a1b6
parentaf501cfce456004e1bce8557bbb24b230442b324 (diff)
- stevesk@cvs.openbsd.org 2009/04/14 16:33:42
[sftp-server.c] remove unused option character from getopt() optstring; ok markus@
-rw-r--r--ChangeLog3
-rw-r--r--sftp-server.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ad4fefc31..b64310628 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,9 @@
29 - stevesk@cvs.openbsd.org 2009/04/13 19:07:44 29 - stevesk@cvs.openbsd.org 2009/04/13 19:07:44
30 [sshd_config.5] 30 [sshd_config.5]
31 fix possessive; ok djm@ 31 fix possessive; ok djm@
32 - stevesk@cvs.openbsd.org 2009/04/14 16:33:42
33 [sftp-server.c]
34 remove unused option character from getopt() optstring; ok markus@
32 35
3320090616 3620090616
34 - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t 37 - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
diff --git a/sftp-server.c b/sftp-server.c
index 24c4ff717..83beeadcf 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-server.c,v 1.84 2008/06/26 06:10:09 djm Exp $ */ 1/* $OpenBSD: sftp-server.c,v 1.85 2009/04/14 16:33:42 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
4 * 4 *
@@ -1341,7 +1341,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
1341 __progname = ssh_get_progname(argv[0]); 1341 __progname = ssh_get_progname(argv[0]);
1342 log_init(__progname, log_level, log_facility, log_stderr); 1342 log_init(__progname, log_level, log_facility, log_stderr);
1343 1343
1344 while (!skipargs && (ch = getopt(argc, argv, "C:f:l:che")) != -1) { 1344 while (!skipargs && (ch = getopt(argc, argv, "f:l:che")) != -1) {
1345 switch (ch) { 1345 switch (ch) {
1346 case 'c': 1346 case 'c':
1347 /* 1347 /*