summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh.c5
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 967908659..cfc3d393e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
120010923 120010923
2 - (bal) updated ssh.c to mirror minor getopts 'extern int' formating done
3 by stevesk@
4
520010923
2 - (bal) OpenBSD CVS Sync 6 - (bal) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2001/09/23 11:09:13 7 - markus@cvs.openbsd.org 2001/09/23 11:09:13
4 [authfile.c] 8 [authfile.c]
@@ -6557,4 +6561,4 @@
6557 - Wrote replacements for strlcpy and mkdtemp 6561 - Wrote replacements for strlcpy and mkdtemp
6558 - Released 1.0pre1 6562 - Released 1.0pre1
6559 6563
6560$Id: ChangeLog,v 1.1556 2001/09/23 13:58:38 mouring Exp $ 6564$Id: ChangeLog,v 1.1557 2001/09/24 20:00:10 mouring Exp $
diff --git a/ssh.c b/ssh.c
index f0cbd799c..6cee5c3ba 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: ssh.c,v 1.143 2001/09/20 13:50:40 markus Exp $"); 42RCSID("$OpenBSD: ssh.c,v 1.144 2001/09/24 03:38:58 stevesk Exp $");
43 43
44#include <openssl/evp.h> 44#include <openssl/evp.h>
45#include <openssl/err.h> 45#include <openssl/err.h>
@@ -265,8 +265,7 @@ main(int ac, char **av)
265 int dummy; 265 int dummy;
266 uid_t original_effective_uid; 266 uid_t original_effective_uid;
267 extern int optopt; 267 extern int optopt;
268 extern int optind; 268 extern int optind, optreset;
269 extern int optreset;
270 extern char *optarg; 269 extern char *optarg;
271 270
272 __progname = get_progname(av[0]); 271 __progname = get_progname(av[0]);