diff options
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.155 2006/11/06 21:25:28 markus Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.156 2006/11/14 19:41:04 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1049,7 +1049,7 @@ usage(void) | |||
1049 | * Main program for key management. | 1049 | * Main program for key management. |
1050 | */ | 1050 | */ |
1051 | int | 1051 | int |
1052 | main(int ac, char **av) | 1052 | main(int argc, char **argv) |
1053 | { | 1053 | { |
1054 | char dotsshdir[MAXPATHLEN], comment[1024], *passphrase1, *passphrase2; | 1054 | char dotsshdir[MAXPATHLEN], comment[1024], *passphrase1, *passphrase2; |
1055 | char out_file[MAXPATHLEN], *reader_id = NULL; | 1055 | char out_file[MAXPATHLEN], *reader_id = NULL; |
@@ -1074,7 +1074,7 @@ main(int ac, char **av) | |||
1074 | __progname = ssh_get_progname(av[0]); | 1074 | __progname = ssh_get_progname(av[0]); |
1075 | 1075 | ||
1076 | SSLeay_add_all_algorithms(); | 1076 | SSLeay_add_all_algorithms(); |
1077 | log_init(av[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); | 1077 | log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); |
1078 | 1078 | ||
1079 | init_rng(); | 1079 | init_rng(); |
1080 | seed_rng(); | 1080 | seed_rng(); |
@@ -1090,7 +1090,7 @@ main(int ac, char **av) | |||
1090 | exit(1); | 1090 | exit(1); |
1091 | } | 1091 | } |
1092 | 1092 | ||
1093 | while ((opt = getopt(ac, av, | 1093 | while ((opt = getopt(argc, argv, |
1094 | "degiqpclBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) { | 1094 | "degiqpclBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) { |
1095 | switch (opt) { | 1095 | switch (opt) { |
1096 | case 'b': | 1096 | case 'b': |
@@ -1223,9 +1223,9 @@ main(int ac, char **av) | |||
1223 | } | 1223 | } |
1224 | 1224 | ||
1225 | /* reinit */ | 1225 | /* reinit */ |
1226 | log_init(av[0], log_level, SYSLOG_FACILITY_USER, 1); | 1226 | log_init(argv[0], log_level, SYSLOG_FACILITY_USER, 1); |
1227 | 1227 | ||
1228 | if (optind < ac) { | 1228 | if (optind < argc) { |
1229 | printf("Too many arguments.\n"); | 1229 | printf("Too many arguments.\n"); |
1230 | usage(); | 1230 | usage(); |
1231 | } | 1231 | } |