From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 3 Oct 2010 04:53:34 +0000 (-0400)
Subject: allow explicit setting of MSVA_KEYSERVER_POLICY to "unlessvalid" (the default)
X-Git-Tag: msva-perl/0.4~18
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ef889e00f32d36bb8648048fe2965f7394546f87;p=monkeysphere-validation-agent.git

allow explicit setting of MSVA_KEYSERVER_POLICY to "unlessvalid" (the default)
---

diff --git a/msva-perl b/msva-perl
index 1cc5181..8d1657c 100755
--- a/msva-perl
+++ b/msva-perl
@@ -361,7 +361,7 @@ use strict;
 
   sub get_keyserver_policy {
     if (exists $ENV{MSVA_KEYSERVER_POLICY}) {
-      if ($ENV{MSVA_KEYSERVER_POLICY} =~ /^(always|never)$/) {
+      if ($ENV{MSVA_KEYSERVER_POLICY} =~ /^(always|never|unlessvalid)$/) {
         return $1;
       }
       msvalog('error', "Not a valid MSVA_KEYSERVER_POLICY):\n  %s\n", $ENV{MSVA_KEYSERVER_POLICY});