[svn] GnuPG - r4079 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2006-03-23 00:05:32 +0100 (Thu, 23 Mar 2006)
New Revision: 4079

Modified:
   trunk/g10/ChangeLog
   trunk/g10/getkey.c
Log:
* getkey.c (parse_auto_key_locate): Silently strip out duplicates rather
than causing an error.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-03-22 16:43:59 UTC (rev 4078)
+++ trunk/g10/ChangeLog	2006-03-22 23:05:32 UTC (rev 4079)
@@ -1,3 +1,8 @@
+2006-03-22  David Shaw  <dshaw at jabberwocky.com>
+
+	* getkey.c (parse_auto_key_locate): Silently strip out duplicates
+	rather than causing an error.
+
 2006-03-22  Werner Koch  <wk at g10code.com>
 
 	* sig-check.c (signature_check2): Changed warning URL to include faq.

Modified: trunk/g10/getkey.c
===================================================================
--- trunk/g10/getkey.c	2006-03-22 16:43:59 UTC (rev 4078)
+++ trunk/g10/getkey.c	2006-03-22 23:05:32 UTC (rev 4079)
@@ -2934,6 +2934,7 @@
   while((tok=optsep(&options)))
     {
       struct akl *akl,*last;
+      int dupe=0;
 
       if(tok[0]=='\0')
 	continue;
@@ -2969,15 +2970,19 @@
 		 || (akl->type==AKL_SPEC
 		     && strcmp(last->spec->uri,akl->spec->uri)==0)))
 	    {
+	      dupe=1;
 	      free_akl(akl);
-	      return 0;
+	      break;
 	    }
 	}
 
-      if(last)
-	last->next=akl;
-      else
-	opt.auto_key_locate=akl;
+      if(!dupe)
+	{
+	  if(last)
+	    last->next=akl;
+	  else
+	    opt.auto_key_locate=akl;
+	}
     }
 
   return 1;