avoid some spurious error messages when no agent is found

diff --git a/Crypt/Monkeysphere/MSVA.pm b/Crypt/Monkeysphere/MSVA.pm
index bd81606b306e294b2ed2ab1ca3bac441579c0243..cadfee6e5b576bc07c9f59a1f35403e5785c14cf 100755 (executable)
--- a/Crypt/Monkeysphere/MSVA.pm
+++ b/Crypt/Monkeysphere/MSVA.pm
@@ -217,6 +217,10 @@
   sub getpidswithsocketinode {
     my $sockid = shift;
 
+    if (! defined ($sockid)) {
+      msvalog('verbose', "No client socket ID to check.  The MSVA is probably not running as a service.\n");
+      return [];
+    }
     # this appears to be how Linux symlinks open sockets in /proc/*/fd,
     # as of at least 2.6.26:
     my $socktarget = sprintf('socket:[%d]', $sockid);

diff --git a/gpgkeys_hkpms b/gpgkeys_hkpms
index 03a79f28c8f41eb520c22d85021dfe3aa7e5b409..75ce01bcb293cb5a66dff56f0470e0084ab8ad8c 100755 (executable)
--- a/gpgkeys_hkpms
+++ b/gpgkeys_hkpms
@@ -92,6 +92,7 @@ use warnings;
         ($status, $ret) = $self->{client}->query_agent('https', $self->{config}->{host}, 'server', 'x509pem', $certpem, 'never');
       } else {
         use Crypt::Monkeysphere::MSVA;
+        $self->{logger}->log('verbose', "Could not find a running agent (MONKEYSPHERE_VALIDATION_AGENT_SOCKET env var).\nFalling back to in-process certificate checks.\n");
         # If there is no running agent, we might want to be able to fall
         # back here.