From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 18 Dec 2010 23:40:41 +0000 (-0500)
Subject: import hkpms settings from gpg.conf also
X-Git-Tag: msva-perl_debian/0.8-1~1^2~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=734a6c9c2a8d63a7d9f85c4e07603d157f9712c2;p=monkeysphere-validation-agent.git

import hkpms settings from gpg.conf also
---

diff --git a/Crypt/Monkeysphere/MSVA.pm b/Crypt/Monkeysphere/MSVA.pm
index 72c99b7..afc3a19 100755
--- a/Crypt/Monkeysphere/MSVA.pm
+++ b/Crypt/Monkeysphere/MSVA.pm
@@ -524,7 +524,7 @@
     if (-f $gpgconf) {
       if (-r $gpgconf) {
         my %gpgconfig = Config::General::ParseConfig($gpgconf);
-        if ($gpgconfig{keyserver} =~ /^(((hkps?|finger|ldap):\/\/)?$RE{net}{domain})$/) {
+        if ($gpgconfig{keyserver} =~ /^(((hkps?|hkpms|finger|ldap):\/\/)?$RE{net}{domain})$/) {
           msvalog('debug', "Using keyserver %s from the GnuPG configuration file (%s)\n", $1, $gpgconf);
           return $1;
         } else {