[git] GnuPG - branch, master, updated. gnupg-2.1.2-69-gf26ba14

[by Neal H. Walfield]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  f26ba14028d34845ae10aae552b90681907e377d (commit)
      from  bec10ae4b5a870303c800cdf3cd906044613fc2d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f26ba14028d34845ae10aae552b90681907e377d
Author: Neal H. Walfield <neal at g10code.de>
Date:   Sat Mar 28 16:55:10 2015 +0100

    gpg: Only use the last specified keyserver.
    
    * g10/gpg.c (main): Only use the last specified keyserver.
    
    --
    
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/gpg.c b/g10/gpg.c
index eb75409..da4224f 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1,6 +1,7 @@
 /* gpg.c - The GnuPG utility (main for gpg)
  * Copyright (C) 1998-2011 Free Software Foundation, Inc.
  * Copyright (C) 1997-2014 Werner Koch
+ * Copyright (C) 2015 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -2829,7 +2830,13 @@ main (int argc, char **argv)
 		log_error (_("could not parse keyserver URL\n"));
 	      else
 		{
-		  keyserver->next = opt.keyserver;
+		  /* We only support a single keyserver.  Later ones
+		     override earlier ones.  (Since we parse the
+		     config file first and then the command line
+		     arguments, the command line takes
+		     precedence.)  */
+		  if (opt.keyserver)
+		    free_keyserver_spec (opt.keyserver);
 		  opt.keyserver = keyserver;
 		}
 	    }

-----------------------------------------------------------------------

Summary of changes:
 g10/gpg.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org