- (djm) OpenBSD CVS Sync

   - deraadt@cvs.openbsd.org 2006/11/14 19:41:04
     [ssh-keygen.c]
     use argc and argv not some made up short form

2 files changed, 13 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index c14cf03d8..cd1c913f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20070105
+ - (djm) OpenBSD CVS Sync
+   - deraadt@cvs.openbsd.org 2006/11/14 19:41:04
+     [ssh-keygen.c]
+     use argc and argv not some made up short form
+
 20061205
  - (djm) [auth.c] Fix NULL pointer dereference in fakepw().  Crash would
    occur if the server did not have the privsep user and an invalid user
@@ -2617,4 +2623,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4591 2006/12/05 11:58:09 djm Exp $
+$Id: ChangeLog,v 1.4592 2007/01/05 05:22:57 djm Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 1f42b9358..dfa1166c2 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.155 2006/11/06 21:25:28 markus Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.156 2006/11/14 19:41:04 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1049,7 +1049,7 @@ usage(void)
  * Main program for key management.
  */
 int
-main(int ac, char **av)
+main(int argc, char **argv)
 {
         char dotsshdir[MAXPATHLEN], comment[1024], *passphrase1, *passphrase2;
         char out_file[MAXPATHLEN], *reader_id = NULL;
@@ -1074,7 +1074,7 @@ main(int ac, char **av)
         __progname = ssh_get_progname(av[0]);
 
         SSLeay_add_all_algorithms();
-        log_init(av[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
+        log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
 
         init_rng();
         seed_rng();
@@ -1090,7 +1090,7 @@ main(int ac, char **av)
                 exit(1);
         }
 
-        while ((opt = getopt(ac, av,
+        while ((opt = getopt(argc, argv,
             "degiqpclBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) {
                 switch (opt) {
                 case 'b':
@@ -1223,9 +1223,9 @@ main(int ac, char **av)
         }
 
         /* reinit */
-        log_init(av[0], log_level, SYSLOG_FACILITY_USER, 1);
+        log_init(argv[0], log_level, SYSLOG_FACILITY_USER, 1);
 
-        if (optind < ac) {
+        if (optind < argc) {
                 printf("Too many arguments.\n");
                 usage();
         }