From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 16 Dec 2010 20:32:25 +0000 (-0500)
Subject: support hkpms queries from the agent
X-Git-Tag: msva-perl_debian/0.7-1~3^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9b8a797e35264c94d4e5132393da4e2017c48e3e;p=monkeysphere-validation-agent.git

support hkpms queries from the agent
---

diff --git a/Crypt/Monkeysphere/MSVA.pm b/Crypt/Monkeysphere/MSVA.pm
index 16e495c..02949f4 100755
--- a/Crypt/Monkeysphere/MSVA.pm
+++ b/Crypt/Monkeysphere/MSVA.pm
@@ -505,7 +505,7 @@
     # We should read from (first hit wins):
     # the environment
     if (exists $ENV{MSVA_KEYSERVER} and $ENV{MSVA_KEYSERVER} ne '') {
-      if ($ENV{MSVA_KEYSERVER} =~ /^(((hkps?|finger|ldap):\/\/)?$RE{net}{domain})$/) {
+      if ($ENV{MSVA_KEYSERVER} =~ /^(((hkps?|hkpms|finger|ldap):\/\/)?$RE{net}{domain})$/) {
         return $1;
       }
       msvalog('error', "Not a valid keyserver (from MSVA_KEYSERVER):\n  %s\n", $ENV{MSVA_KEYSERVER});