From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 6 Dec 2010 05:36:42 +0000 (-0500)
Subject: enable requesting keyserverpolicy in Crypt::Monkeysphere::MSVA::Client
X-Git-Tag: msva-perl_debian/0.7-1~5^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4b7b7f97702764b5ef6de55592492579ed9f75f4;p=monkeysphere-validation-agent.git

enable requesting keyserverpolicy in Crypt::Monkeysphere::MSVA::Client
---

diff --git a/Crypt/Monkeysphere/MSVA/Client.pm b/Crypt/Monkeysphere/MSVA/Client.pm
index ad1cb5d..45ae447 100644
--- a/Crypt/Monkeysphere/MSVA/Client.pm
+++ b/Crypt/Monkeysphere/MSVA/Client.pm
@@ -43,8 +43,9 @@
     my $peertype = shift;
     my $pkctype = shift;
     my $pkcdata = shift;
+    my $keyserverpolicy = shift;
 
-    my $apd = $self->create_apd($context, $peer, $peertype, $pkctype, $pkcdata);
+    my $apd = $self->create_apd($context, $peer, $peertype, $pkctype, $pkcdata, $keyserverpolicy);
 
     my $apdjson = to_json($apd);
 
@@ -83,6 +84,7 @@
     my $peertype = shift;
     my $pkctype = shift;
     my $pkcdata = shift;
+    my $keyserverpolicy = shift;
 
     $self->log('debug', "context: %s\n", $context);
     $self->log('debug', "peer: %s\n", $peer);
@@ -129,6 +131,8 @@
               };
     $ret->{peer}->{type} = $peertype
       if (defined $peertype);
+    $ret->{keyserverpolicy} = $keyserverpolicy
+      if (defined $keyserverpolicy);
 
     return $ret;
   };