projects
/
monkeysphere-validation-agent.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d17b5b5
)
import hkpms settings from gpg.conf also
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Sat, 18 Dec 2010 23:40:41 +0000
(18:40 -0500)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Sun, 19 Dec 2010 03:41:40 +0000
(22:41 -0500)
Crypt/Monkeysphere/MSVA.pm
patch
|
blob
|
history
diff --git
a/Crypt/Monkeysphere/MSVA.pm
b/Crypt/Monkeysphere/MSVA.pm
index 72c99b7f3ec93f3a52d4670c8652e852760298d1..afc3a19460073371e79048f35b5ebf2fff79e56e 100755
(executable)
--- 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 {