* keygen.c (keygen_set_std_prefs): Build the default preferences list at

runtime as it properly handles algorithms disabled at build or run time.

* getkey.c (merge_selfsigs_main): Properly handle expired user IDs when
the expired self-sig is not the only self-sig.

* misc.c (compress_algo_to_string): Return NULL on failure like all of the
other xxxx_algo_to_string() functions.

* mainproc.c (list_node): Minor spacing tweak to match --list-keys output.

* keylist.c (list_keyblock_print), mainproc.c (list_node): Mark revoked
subkeys as revoked.  Requested by Matthew Wilcox.  Revoked overrides
expiration when both apply.

* keyedit.c (show_prefs): Use compress algo constants.
(show_basic_key_info): Make revoked and expired tags translatable.

* g10.c (rm_group): Properly ungroup from a list of groups.

1 files changed, 1 insertions, 0 deletions

diff --git a/g10/g10.c b/g10/g10.c
index 3b537710b..25be39abf 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -993,6 +993,7 @@ rm_group(char *name)
 
 	  free_strlist(item->values);
 	  m_free(item);
+	  break;
 	}
     }
 }