aboutsummaryrefslogtreecommitdiffstats
path: root/g10/keyedit.c
diff options
context:
space:
mode:
Diffstat (limited to 'g10/keyedit.c')
-rw-r--r--g10/keyedit.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 89f26c765..94c34e96e 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1,6 +1,6 @@
/* keyedit.c - keyedit stuff
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- * 2006 Free Software Foundation, Inc.
+ * 2006, 2007 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -1554,6 +1554,10 @@ keyedit_menu( const char *username, strlist_t locusr,
if( collapse_uids( &keyblock ) )
modified++;
reorder_keyblock(keyblock);
+ /* We modified the keyblock, so let's make sure the flags are
+ right. */
+ if (modified)
+ merge_keys_and_selfsig (keyblock);
if(seckey_check)
{/* see whether we have a matching secret key */