2 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 8d628c5fa..74f07f35e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -77,6 +77,9 @@
    - stevesk@cvs.openbsd.org 2006/07/09 15:27:59
      [ssh-add.c]
      use O_RDONLY vs. 0 in open(); no binary change
+   - djm@cvs.openbsd.org 2006/07/10 11:24:54
+     [sftp-server.c]
+     remove optind - it isn't used here
 
 20060706
  - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4810,4 +4813,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4378 2006/07/10 11:14:00 djm Exp $
+$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 @@
-/* $OpenBSD: sftp-server.c,v 1.59 2006/07/09 15:15:11 stevesk Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.60 2006/07/10 11:24:54 djm Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -1201,7 +1201,6 @@ main(int argc, char **argv)
         SyslogFacility log_facility = SYSLOG_FACILITY_AUTH;
         char *cp;
 
-        extern int optind;
         extern char *optarg;
         extern char *__progname;