summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/ssh-rand-helper.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2010-03-09 19:16:43 +0000
committerdes <des@FreeBSD.org>2010-03-09 19:16:43 +0000
commitc3510f9e73156eaabbbfc18da7d796b9f9ff7ea9 (patch)
tree286162d33ef4c84bb329fd42641bbe0dd68cc42c /crypto/openssh/ssh-rand-helper.c
parent68f48e51f9a4d71d7fb9c332592215895a206ff6 (diff)
parent57baac6b030508c9bcd74f3b995bd6a4a4f79211 (diff)
downloadFreeBSD-src-c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9.zip
FreeBSD-src-c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9.tar.gz
Upgrade to OpenSSH 5.4p1.
MFC after: 1 month
Diffstat (limited to 'crypto/openssh/ssh-rand-helper.c')
-rw-r--r--crypto/openssh/ssh-rand-helper.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/crypto/openssh/ssh-rand-helper.c b/crypto/openssh/ssh-rand-helper.c
index 8b1c4b4..fa50704 100644
--- a/crypto/openssh/ssh-rand-helper.c
+++ b/crypto/openssh/ssh-rand-helper.c
@@ -818,6 +818,7 @@ main(int argc, char **argv)
unsigned char *buf;
int ret, ch, debug_level, output_hex, bytes;
extern char *optarg;
+ extern int optind;
LogLevel ll;
__progname = ssh_get_progname(argv[0]);
@@ -853,11 +854,17 @@ main(int argc, char **argv)
default:
error("Invalid commandline option");
usage();
+ exit(1);
}
}
-
log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
+ if (argc != optind) {
+ error("Unexpected commandline arguments.");
+ usage();
+ exit(1);
+ }
+
#ifdef USE_SEED_FILES
prng_read_seedfile();
#endif
OpenPOWER on IntegriCloud