From 2d682ddc0055910fff49a2ba10f445d8cdf4e86f Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Tue, 26 Aug 2003 04:07:52 +0000
Subject: [PATCH] * 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.
---
 g10/ChangeLog |  7 +++++++
 g10/g10.c     |  3 ++-
 g10/keyedit.c |  4 +++-
 g10/options.h | 15 ++++++++-------
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 8a6a15e21..293379620 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -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
diff --git a/g10/g10.c b/g10/g10.c
index 7b5cfbc9b..01dc86fb6 100644
--- 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}
 		};
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 42ece5496..7b696c53b 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -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;
diff --git a/g10/options.h b/g10/options.h
index e24337117..91855bab6 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -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