diff options
| author | Peter Palfrader <peter@palfrader.org> | 2003-02-15 11:43:41 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2003-02-15 11:43:41 +0000 |
| commit | e61c9c9f2e96a129f31a1bf49d4f2514137a3b01 (patch) | |
| tree | 3759bc4364e782fa7cb177571ad195cb82121c36 /Echolot/Pinger | |
| parent | 7adc1b95176205694c1b34878b185a41c82373e9 (diff) | |
Chain pinging fixes
Diffstat (limited to 'Echolot/Pinger')
| -rw-r--r-- | Echolot/Pinger/CPunk.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Echolot/Pinger/CPunk.pm b/Echolot/Pinger/CPunk.pm index a82e791..6f4ca62 100644 --- a/Echolot/Pinger/CPunk.pm +++ b/Echolot/Pinger/CPunk.pm @@ -1,7 +1,7 @@ package Echolot::Pinger::CPunk; # (c) 2002 Peter Palfrader <peter@palfrader.org> -# $Id: CPunk.pm,v 1.12 2003/02/14 04:56:16 weasel Exp $ +# $Id: CPunk.pm,v 1.13 2003/02/15 11:43:41 weasel Exp $ # =pod @@ -136,8 +136,11 @@ sub encrypt_to($$$$) { #($stderr eq '') or #Echolot::Log::warn("GnuPG returned something in stderr: '$stderr' while encrypting to '$recipient'."), #return undef; - (($status =~ /^^\[GNUPG:\] BEGIN_ENCRYPTION\s/m) && - ($status =~ /^^\[GNUPG:\] END_ENCRYPTION\s/m)) or + ($status =~ /^\[GNUPG:\] KEYEXPIRED (\d+)/m) and + Echolot::Log::info("Key $recipient expired at ".scalar gmtime($1)." UTC"), + return undef; + (($status =~ /^\[GNUPG:\] BEGIN_ENCRYPTION\s/m) && + ($status =~ /^\[GNUPG:\] END_ENCRYPTION\s/m)) or Echolot::Log::info("GnuPG status '$status' didn't indicate message to '$recipient' was encrypted correctly (stderr: $stderr; args: ".join(' ', @$command_args).")."), return undef; |