summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-05 14:13:25 +1000
committerDamien Miller <djm@mindrot.org>2011-05-05 14:13:25 +1000
commit111431963ef704c0ee2e6130ce986e6891ab7a90 (patch)
tree4be2ebc4fdbf7c2ee62f479519bbebe922e9356d
parent4a4d161545447bb847aa01dd5332a9424271da44 (diff)
- stevesk@cvs.openbsd.org 2011/03/23 16:50:04
[ssh-keygen.c] remove -d, documentation removed >10 years ago; ok markus
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keygen.c7
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4dfaa2780..6176bd89e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,9 @@
29 - stevesk@cvs.openbsd.org 2011/03/23 16:24:56 29 - stevesk@cvs.openbsd.org 2011/03/23 16:24:56
30 [ssh-keygen.1] 30 [ssh-keygen.1]
31 -q not used in /etc/rc now so remove statement. 31 -q not used in /etc/rc now so remove statement.
32 - stevesk@cvs.openbsd.org 2011/03/23 16:50:04
33 [ssh-keygen.c]
34 remove -d, documentation removed >10 years ago; ok markus
32 35
3320110221 3620110221
34 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the 37 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the
diff --git a/ssh-keygen.c b/ssh-keygen.c
index aae33e308..14aefbb98 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.206 2011/03/23 15:16:22 stevesk Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.207 2011/03/23 16:50:04 stevesk 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
@@ -1955,7 +1955,7 @@ main(int argc, char **argv)
1955 exit(1); 1955 exit(1);
1956 } 1956 }
1957 1957
1958 while ((opt = getopt(argc, argv, "AdegiqpclBHLhvxXyF:b:f:t:D:I:P:m:N:n:" 1958 while ((opt = getopt(argc, argv, "AegiqpclBHLhvxXyF:b:f:t:D:I:P:m:N:n:"
1959 "O:C:r:g:R:T:G:M:S:s:a:V:W:z:")) != -1) { 1959 "O:C:r:g:R:T:G:M:S:s:a:V:W:z:")) != -1) {
1960 switch (opt) { 1960 switch (opt) {
1961 case 'A': 1961 case 'A':
@@ -2055,9 +2055,6 @@ main(int argc, char **argv)
2055 case 'y': 2055 case 'y':
2056 print_public = 1; 2056 print_public = 1;
2057 break; 2057 break;
2058 case 'd':
2059 key_type_name = "dsa";
2060 break;
2061 case 's': 2058 case 's':
2062 ca_key_path = optarg; 2059 ca_key_path = optarg;
2063 break; 2060 break;