From 1594883f2f99d6a46a8053e60a2051a5954a7591 Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Fri, 10 Jun 2005 03:15:25 +0000
Subject: [PATCH] * options.h, import.c (parse_import_options,
 delete_inv_parts): import-unusable-sigs is now a noop.

---
 g10/ChangeLog |  3 +++
 g10/import.c  | 27 ++-------------------------
 g10/options.h |  1 -
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/g10/ChangeLog b/g10/ChangeLog
index f65ea64c6..7e0fefdbd 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-09  David Shaw  <dshaw@jabberwocky.com>
 
+	* options.h, import.c (parse_import_options, delete_inv_parts):
+	import-unusable-sigs is now a noop.
+
 	* options.h, export.c (do_export_stream), keyedit.c (keyedit_menu,
 	menu_clean_subkeys_from_key), trustdb.h, trustdb.c
 	(clean_subkeys_from_key): Remove subkey cleaning function.  It is
diff --git a/g10/import.c b/g10/import.c
index b95a9e8eb..04099deba 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -94,10 +94,11 @@ parse_import_options(char *str,unsigned int *options,int noisy)
       {"fast-import",IMPORT_FAST,NULL},
       {"convert-sk-to-pk",IMPORT_SK2PK,NULL},
       {"merge-only",IMPORT_MERGE_ONLY,NULL},
-      {"import-unusable-sigs",IMPORT_UNUSABLE_SIGS,NULL},
       /* Aliases for backward compatibility */
       {"allow-local-sigs",IMPORT_LOCAL_SIGS,NULL},
       {"repair-hkp-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG,NULL},
+      /* dummy */
+      {"import-unusable-sigs",0,NULL},
       {NULL,0,NULL}
     };
 
@@ -1556,30 +1557,6 @@ delete_inv_parts( const char *fname, KBNODE keyblock,
 		       node->pkt->pkt.signature->sig_class);
 	    delete_kbnode(node);
 	  }
-	else if(node->pkt->pkttype==PKT_SIGNATURE
-		&& IS_UID_SIG(node->pkt->pkt.signature)
-		&& node->pkt->pkt.signature->flags.expired
-		&& (node->pkt->pkt.signature->keyid[0]!=keyid[0]
-		    || node->pkt->pkt.signature->keyid[1]!=keyid[1])
-		&& !(options&IMPORT_UNUSABLE_SIGS))
-	  {
-	    /* Note that we haven't necessarily checked this sig for
-	       validity.  We strip it anyway since if it was valid, it
-	       would be expired.  If it wasn't valid, it either would
-	       be expired if it was valid, or was altered to the point
-	       that it looked expired (and so doesn't matter terribly
-	       much if it is expired or not). */
-	    if(opt.verbose)
-	      {
-		char *kid=m_strdup(keystr(keyid));
-		log_info(_("key %s: expired signature from key %s -"
-			   " skipped\n"),kid,
-			 keystr(node->pkt->pkt.signature->keyid));
-		m_free(kid);
-	      }
-
-	    delete_kbnode(node);
-	  }
 	else if( (node->flag & 4) ) /* marked for deletion */
 	  delete_kbnode( node );
     }
diff --git a/g10/options.h b/g10/options.h
index 6741fa657..87c10673f 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -251,7 +251,6 @@ struct {
 #define IMPORT_FAST                      (1<<2)
 #define IMPORT_SK2PK                     (1<<3)
 #define IMPORT_MERGE_ONLY                (1<<4)
-#define IMPORT_UNUSABLE_SIGS             (1<<5)
 
 #define EXPORT_LOCAL_SIGS                (1<<0)
 #define EXPORT_ATTRIBUTES                (1<<1)