[svn] GnuPG - r3920 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2005-11-02 17:47:02 +0100 (Wed, 02 Nov 2005)
New Revision: 3920

Modified:
   trunk/g10/ChangeLog
   trunk/g10/trustdb.c
Log:
* trustdb.c (clean_sigs_from_uid): Include sigs from unavailable keys in
the sigs that are cleaned.  Suggested by Dirk Traulsen and many others.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2005-11-02 05:22:01 UTC (rev 3919)
+++ trunk/g10/ChangeLog	2005-11-02 16:47:02 UTC (rev 3920)
@@ -1,3 +1,9 @@
+2005-11-02  David Shaw  <dshaw at jabberwocky.com>
+
+	* trustdb.c (clean_sigs_from_uid): Include sigs from unavailable
+	keys in the sigs that are cleaned.  Suggested by Dirk Traulsen and
+	many others.
+
 2005-11-01  David Shaw  <dshaw at jabberwocky.com>
 
 	* import.c (import_one): Do collapse_uids() before we do any

Modified: trunk/g10/trustdb.c
===================================================================
--- trunk/g10/trustdb.c	2005-11-02 05:22:01 UTC (rev 3919)
+++ trunk/g10/trustdb.c	2005-11-02 16:47:02 UTC (rev 3920)
@@ -1616,19 +1616,25 @@
 	continue;
 
       /* ... and sigs from unavailable keys. */
-      if(node->flag & (1<<12))
+      /* disabled for now since more people seem to want sigs from
+	 unavailable keys removed altogether.  */
+      /*
+	if(node->flag & (1<<12))
 	continue;
+      */
 
       /* Everything else we delete */
 
-      /* if 9 or 10 is set, but we get this far, it's superceded,
-	 otherwise, it's invalid */
+      /* At this point, if 12 is set, the signing key was unavailable.
+	 If 9 or 10 is set, it's superceded.  Otherwise, it's
+	 invalid. */
 
       if(noisy)
-	log_info("removing signature from %s on uid \"%s\": %s\n",
+	log_info("removing signature from key %s on user ID \"%s\": %s\n",
 		 keystr(node->pkt->pkt.signature->keyid),
 		 uidnode->pkt->pkt.user_id->name,
-		 node->flag&(1<<9)?"superceded":"invalid");
+		 node->flag&(1<<12)?"key unavailable":
+		 node->flag&(1<<9)?"signature superceded":"invalid signature");
 
       delete_kbnode(node);
       deleted++;