* passphrase.c (agent_get_passphrase): Use keystrs for agent strings, and
[gnupg.git] / g10 / keyedit.c
index 5a81828..1ba8953 100644 (file)
@@ -2170,7 +2170,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
 {
     KBNODE node;
     int i;
-    int do_warn = 0, indent=0;
+    int do_warn = 0;
     byte pk_version=0;
     PKT_public_key *primary=NULL;
 
@@ -2324,17 +2324,6 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
     
     /* the user ids */
 
-    for( node = keyblock; node; node = node->next )
-      {
-       if(node->pkt->pkttype == PKT_USER_ID
-          && (node->pkt->pkt.user_id->is_revoked
-              || node->pkt->pkt.user_id->is_expired))
-         {
-           indent=1;
-           break;
-         }
-      }
-
     i = 0;
     for( node = keyblock; node; node = node->next ) {
        if( node->pkt->pkttype == PKT_USER_ID ) {
@@ -2345,11 +2334,9 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
                  tty_printf("[%8.8s] ",_("revoked"));
                else if(uid->is_expired)
                  tty_printf("[%8.8s] ",_("expired"));
-               else if(opt.list_options&LIST_SHOW_UID_VALIDITY && primary)
+               else if(primary)
                  tty_printf("[%8.8s] ",
                             trust_value_to_string(get_validity(primary,uid)));
-               else if(indent)
-                 tty_printf("           ");
                if( only_marked )
                   tty_printf("     ");
                else if( node->flag & NODFLG_SELUID )