[Pkg-privacy-commits] [msva-perl] 10/15: use the last keyserver entry if there is more than one.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository msva-perl.

commit 49ce1309604dc4d9138b2a2ecb2bc604830f870f
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Sep 9 00:55:25 2013 -0400

    use the last keyserver entry if there is more than one.
    
    see https://labs.riseup.net/code/issues/6252
---
 Changelog                       | 4 +++-
 Crypt/Monkeysphere/Keyserver.pm | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index d4ab87a..98b7d8c 100644
--- a/Changelog
+++ b/Changelog
@@ -2,8 +2,10 @@ msva-perl (0.9.2) upstream;
 
   * tweak POD to declare charset
   * openpgp2x509: a bit more clean up and features (needs more work)
+  * handle multiple keyserver entries in gpg.conf gracefully
+    (closes MS #6252)
 
- -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Fri, 23 Aug 2013 10:20:28 -0400
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Mon, 09 Sep 2013 01:16:47 -0400
 
 msva-perl (0.9.1) upstream;
 
diff --git a/Crypt/Monkeysphere/Keyserver.pm b/Crypt/Monkeysphere/Keyserver.pm
index e8a1b77..83e4a24 100644
--- a/Crypt/Monkeysphere/Keyserver.pm
+++ b/Crypt/Monkeysphere/Keyserver.pm
@@ -82,6 +82,10 @@ sub _read_keyserver_from_gpg_conf() {
   if (-f $gpgconf) {
     if (-r $gpgconf) {
       my %gpgconfig = Config::General::ParseConfig($gpgconf);
+      if (ref($gpgconfig{keyserver}) eq 'ARRAY') {
+        # use the last keyserver entry if there is more than one.
+        $gpgconfig{keyserver} = pop(@{$gpgconfig{keyserver}});
+      }
       if ($gpgconfig{keyserver} =~ /^(((hkps?|hkpms|finger|ldap):\/\/)?$RE{net}{domain})$/) {
 	$self->log('debug', "Using keyserver %s from the GnuPG configuration file (%s)\n", $1, $gpgconf);
 	return $1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/msva-perl.git