- djm@cvs.openbsd.org 2013/12/06 03:40:51

     [ssh-keygen.c]
     remove duplicated character ('g') in getopt() string;
     document the (few) remaining option characters so we don't have to
     rummage next time.

diff --git a/ChangeLog b/ChangeLog
index 7c812e518260c10f11769e128614ec150597fe7e..f5e06c9e4efa12e0075724842b21d0e8892e3dca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
      [sftp-client.c]
      fix memory leak in error path in do_readdir(); pointed out by
      Loganaden Velvindron @ AfriNIC in bz#2163
+   - djm@cvs.openbsd.org 2013/12/06 03:40:51
+     [ssh-keygen.c]
+     remove duplicated character ('g') in getopt() string;
+     document the (few) remaining option characters so we don't have to
+     rummage next time.
 
 20131205
  - (djm) OpenBSD CVS Sync

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 678dafe87d55fb434312a735588b1627b69293b2..e5e2f2f6c59370e6bd8492ef8168ffd0602b7239 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.235 2013/10/23 04:16:22 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.236 2013/12/06 03:40:51 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2225,8 +2225,9 @@ main(int argc, char **argv)
                exit(1);
        }
 
+       /* Remaining characters: EUYZdow */
        while ((opt = getopt(argc, argv, "ABHLQXceghiklpquvxy"
-           "C:D:F:G:I:J:K:M:N:O:P:R:S:T:V:W:a:b:f:g:j:m:n:r:s:t:z:")) != -1) {
+           "C:D:F:G:I:J:K:M:N:O:P:R:S:T:V:W:a:b:f:j:m:n:r:s:t:z:")) != -1) {
                switch (opt) {
                case 'A':
                        gen_all_hostkeys = 1;