summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2012-10-05 10:52:51 +1000
committerDarren Tucker <dtucker@zip.com.au>2012-10-05 10:52:51 +1000
commit0dc283b13acdd4926dec1289b94badc3bbc7f321 (patch)
tree4771d5fe4040f927513326e3a7a540731ec8f7a7
parent3a7c04105a545188b84bd3b4db682d8d64a7ea8f (diff)
- djm@cvs.openbsd.org 2012/10/02 07:07:45
[ssh-keygen.c] fix -z option, broken in revision 1.215
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keygen.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 544f8d2b..e4899f36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
- naddy@cvs.openbsd.org 2012/10/01 13:59:51
[monitor_wrap.c]
pasto; ok djm@
+ - djm@cvs.openbsd.org 2012/10/02 07:07:45
+ [ssh-keygen.c]
+ fix -z option, broken in revision 1.215
20120917
- (dtucker) OpenBSD CVS Sync
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 5060276d..11d1dd02 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.217 2012/08/17 01:25:58 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.218 2012/10/02 07:07:45 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1975,7 +1975,7 @@ main(int argc, char **argv)
}
while ((opt = getopt(argc, argv, "AegiqpclBHLhvxXyF:b:f:t:D:I:J:j:K:P:"
- "m:N:n:O:C:r:g:R:T:G:M:S:s:a:V:W:z")) != -1) {
+ "m:N:n:O:C:r:g:R:T:G:M:S:s:a:V:W:z:")) != -1) {
switch (opt) {
case 'A':
gen_all_hostkeys = 1;