diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sftp-server.c | 3 |
2 files changed, 5 insertions, 3 deletions
@@ -77,6 +77,9 @@ | |||
77 | - stevesk@cvs.openbsd.org 2006/07/09 15:27:59 | 77 | - stevesk@cvs.openbsd.org 2006/07/09 15:27:59 |
78 | [ssh-add.c] | 78 | [ssh-add.c] |
79 | use O_RDONLY vs. 0 in open(); no binary change | 79 | use O_RDONLY vs. 0 in open(); no binary change |
80 | - djm@cvs.openbsd.org 2006/07/10 11:24:54 | ||
81 | [sftp-server.c] | ||
82 | remove optind - it isn't used here | ||
80 | 83 | ||
81 | 20060706 | 84 | 20060706 |
82 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when | 85 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when |
@@ -4810,4 +4813,4 @@ | |||
4810 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4813 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4811 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4814 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4812 | 4815 | ||
4813 | $Id: ChangeLog,v 1.4378 2006/07/10 11:14:00 djm Exp $ | 4816 | $Id: ChangeLog,v 1.4379 2006/07/10 11:31:00 djm Exp $ |
diff --git a/sftp-server.c b/sftp-server.c index 0c6f4c24e..31be27b4f 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-server.c,v 1.59 2006/07/09 15:15:11 stevesk Exp $ */ | 1 | /* $OpenBSD: sftp-server.c,v 1.60 2006/07/10 11:24:54 djm 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 | * |
@@ -1201,7 +1201,6 @@ main(int argc, char **argv) | |||
1201 | SyslogFacility log_facility = SYSLOG_FACILITY_AUTH; | 1201 | SyslogFacility log_facility = SYSLOG_FACILITY_AUTH; |
1202 | char *cp; | 1202 | char *cp; |
1203 | 1203 | ||
1204 | extern int optind; | ||
1205 | extern char *optarg; | 1204 | extern char *optarg; |
1206 | extern char *__progname; | 1205 | extern char *__progname; |
1207 | 1206 | ||