* options.h, g10.c (main): Add list-option list-preferred-keyserver.
authorDavid Shaw <dshaw@jabberwocky.com>
Tue, 26 Aug 2003 04:07:52 +0000 (04:07 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Tue, 26 Aug 2003 04:07:52 +0000 (04:07 +0000)
* keyedit.c (change_passphrase): When responding 'no' to the blank
passphrase question, re-prompt for a new passphrase.  This is bug #202.

g10/ChangeLog
g10/g10.c
g10/keyedit.c
g10/options.h

index 8a6a15e..2933796 100644 (file)
@@ -1,5 +1,12 @@
 2003-08-25  David Shaw  <dshaw@jabberwocky.com>
 
+       * options.h, g10.c (main): Add list-option
+       list-preferred-keyserver.
+
+       * keyedit.c (change_passphrase): When responding 'no' to the blank
+       passphrase question, re-prompt for a new passphrase.  This is bug
+       #202.
+
        * mainproc.c (check_sig_and_print): Use two different preferred
        keyserver displays - one if the key is not present (to tell the
        user where to get the key), the other if it is present (to tell
index 7b5cfbc..01dc86f 100644 (file)
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1761,9 +1761,10 @@ main( int argc, char **argv )
                  {"show-photos",LIST_SHOW_PHOTOS},
                  {"show-policy-url",LIST_SHOW_POLICY},
                  {"show-notation",LIST_SHOW_NOTATION},
-                 {"show-keyring",LIST_SHOW_KEYRING},
+                 {"show-preferred-keyserver",LIST_SHOW_KEYSERVER},
                  {"show-validity",LIST_SHOW_VALIDITY},
                  {"show-long-keyid",LIST_SHOW_LONG_KEYID},
+                 {"show-keyring",LIST_SHOW_KEYRING},
                  {"show-sig-expire",LIST_SHOW_SIG_EXPIRE},
                  {NULL,0}
                };
index 42ece54..7b696c5 100644 (file)
@@ -1003,8 +1003,10 @@ change_passphrase( KBNODE keyblock )
                            " this is probably a *bad* idea!\n\n"));
                if( cpr_get_answer_is_yes("change_passwd.empty.okay",
                               _("Do you really want to do this? ")))
+                 {
                    changed++;
-               break;
+                   break;
+                 }
            }
            else { /* okay */
                rc = 0;
index e243371..91855ba 100644 (file)
@@ -228,13 +228,14 @@ struct {
 #define EXPORT_INCLUDE_ATTRIBUTES        4
 #define EXPORT_INCLUDE_SENSITIVE_REVKEYS 8
 
-#define LIST_SHOW_PHOTOS      1
-#define LIST_SHOW_POLICY      2
-#define LIST_SHOW_NOTATION    4
-#define LIST_SHOW_KEYRING     8
-#define LIST_SHOW_VALIDITY   16
-#define LIST_SHOW_LONG_KEYID 32
-#define LIST_SHOW_SIG_EXPIRE 64
+#define LIST_SHOW_PHOTOS        1
+#define LIST_SHOW_POLICY        2
+#define LIST_SHOW_NOTATION      4
+#define LIST_SHOW_KEYSERVER     8
+#define LIST_SHOW_VALIDITY     16
+#define LIST_SHOW_LONG_KEYID   32
+#define LIST_SHOW_KEYRING      64
+#define LIST_SHOW_SIG_EXPIRE  128
 
 #define VERIFY_SHOW_PHOTOS      1
 #define VERIFY_SHOW_POLICY      2