allow explicit setting of MSVA_KEYSERVER_POLICY to "unlessvalid" (the default)
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 3 Oct 2010 04:53:34 +0000 (00:53 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 3 Oct 2010 04:53:34 +0000 (00:53 -0400)
msva-perl

index 1cc518158f7dcc07da300461be56a9db5f2eb9e1..8d1657c76ecca8ecf9b9dcedfa2cf0dd10f334fa 100755 (executable)
--- 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});