gnupg/g10 (ChangeLog import.c options.h)

[cvs user dshaw]

    Date: Friday, June 10, 2005 @ 05:15:25
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog import.c options.h

* options.h, import.c (parse_import_options, delete_inv_parts):
import-unusable-sigs is now a noop.


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


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.754 gnupg/g10/ChangeLog:1.755
--- gnupg/g10/ChangeLog:1.754	Fri Jun 10 05:00:57 2005
+++ gnupg/g10/ChangeLog	Fri Jun 10 05:15:25 2005
@@ -1,5 +1,8 @@
 2005-06-09  David Shaw  <dshaw at 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
Index: gnupg/g10/import.c
diff -u gnupg/g10/import.c:1.122 gnupg/g10/import.c:1.123
--- gnupg/g10/import.c:1.122	Tue May 31 10:39:16 2005
+++ gnupg/g10/import.c	Fri Jun 10 05:15:25 2005
@@ -94,10 +94,11 @@
       {"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 @@
 		       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 );
     }
Index: gnupg/g10/options.h
diff -u gnupg/g10/options.h:1.141 gnupg/g10/options.h:1.142
--- gnupg/g10/options.h:1.141	Fri Jun 10 05:00:57 2005
+++ gnupg/g10/options.h	Fri Jun 10 05:15:25 2005
@@ -251,7 +251,6 @@
 #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)