summaryrefslogtreecommitdiffstats
path: root/g10/keyedit.c
diff options
context:
space:
mode:
Diffstat (limited to 'g10/keyedit.c')
-rw-r--r--g10/keyedit.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c
index a504d06c7..62921349c 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -571,10 +571,12 @@ keyedit_menu( const char *username, STRLIST locusr )
tty_printf("\n");
redisplay = 0;
}
- m_free(answer);
- answer = cpr_get(N_("keyedit.cmd"), _("Command> "));
- cpr_kill_prompt();
- trim_spaces(answer);
+ do {
+ m_free(answer);
+ answer = cpr_get(N_("keyedit.cmd"), _("Command> "));
+ cpr_kill_prompt();
+ trim_spaces(answer);
+ } while( *answer == '#' );
arg_number = 0;
if( !*answer )
@@ -645,7 +647,7 @@ keyedit_menu( const char *username, STRLIST locusr )
}
else
tty_printf(_("Key not changed so no update needed.\n"));
- rc = update_trust_record( keyblock );
+ rc = update_trust_record( keyblock, NULL );
if( rc )
log_error(_("update of trust db failed: %s\n"),
g10_errstr(rc) );
@@ -703,7 +705,7 @@ keyedit_menu( const char *username, STRLIST locusr )
sec_modified = modified = 1;
/* must update the trustdb already here, so that preferences
* get listed correctly */
- rc = update_trust_record( keyblock );
+ rc = update_trust_record( keyblock, NULL );
if( rc ) {
log_error(_("update of trust db failed: %s\n"),
g10_errstr(rc) );