bug fix releaseV0-3-4

1 files changed, 13 insertions, 2 deletions

diff --git a/g10/pkclist.c b/g10/pkclist.c
index 59cc9b7d3..e85b289f5 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -81,9 +81,17 @@ edit_ownertrust( ulong lid, int mode )
 " 2 = I do NOT trust\n"
 " 3 = I trust marginally\n"
 " 4 = I trust fully\n"
-" s = please show me more information\n\n") );
+" s = please show me more information\n") );
+    if( mode )
+	tty_printf(_(" m = back to the main menu\n"));
+    tty_printf("\n");
 
     for(;;) {
+	/* a string with valid answers */
+	char *ans = _("sSmM");
+
+	if( strlen(ans) != 4 )
+	    BUG();
 	p = cpr_get(N_("edit_ownertrust.value"),_("Your decision? "));
 	trim_spaces(p);
 	cpr_kill_prompt();
@@ -102,9 +110,12 @@ edit_ownertrust( ulong lid, int mode )
 		changed++;
 	    break;
 	}
-	else if( *p == 's' || *p == 'S' ) {
+	else if( *p == ans[0] || *p == ans[1] ) {
 	    tty_printf(_("You will see a list of signators etc. here\n"));
 	}
+	else if( mode && (*p == ans[2] || *p == ans[3]) ) {
+	    break ; /* back to the menu */
+	}
 	m_free(p); p = NULL;
     }
     m_free(p);