From 97b0606a95b2d18374cbdae64a054d71153508b3 Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Wed, 22 Mar 2006 23:05:32 +0000
Subject: [PATCH] * getkey.c (parse_auto_key_locate): Silently strip out
 duplicates rather than causing an error.

---
 g10/ChangeLog |  5 +++++
 g10/getkey.c  | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 3b37911bc..18c729975 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-22  David Shaw  <dshaw@jabberwocky.com>
+
+	* getkey.c (parse_auto_key_locate): Silently strip out duplicates
+	rather than causing an error.
+
 2006-03-22  Werner Koch  <wk@g10code.com>
 
 	* sig-check.c (signature_check2): Changed warning URL to include faq.
diff --git a/g10/getkey.c b/g10/getkey.c
index 0a314c4ee..1c85fb405 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -2934,6 +2934,7 @@ parse_auto_key_locate(char *options)
   while((tok=optsep(&options)))
     {
       struct akl *akl,*last;
+      int dupe=0;
 
       if(tok[0]=='\0')
 	continue;
@@ -2969,15 +2970,19 @@ parse_auto_key_locate(char *options)
 		 || (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;