diff options
| author | Peter Palfrader <peter@palfrader.org> | 2002-07-02 18:03:55 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2002-07-02 18:03:55 +0000 |
| commit | bcb4b53f7c2aec7062fac9f468496381a257ad82 (patch) | |
| tree | 0cb2a6507df952e4788c78d35a726f8d6c20d660 /Echolot/Conf.pm | |
| parent | 6319ed28454066f9530ab9c758ce85faedb6d6f9 (diff) | |
ping cpunk without pgponly in clear too
Diffstat (limited to 'Echolot/Conf.pm')
| -rw-r--r-- | Echolot/Conf.pm | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/Echolot/Conf.pm b/Echolot/Conf.pm index 76b8aa0..6e8a6fd 100644 --- a/Echolot/Conf.pm +++ b/Echolot/Conf.pm @@ -1,7 +1,7 @@ package Echolot::Conf; # (c) 2002 Peter Palfrader <peter@palfrader.org> -# $Id: Conf.pm,v 1.8 2002/07/02 17:06:59 weasel Exp $ +# $Id: Conf.pm,v 1.9 2002/07/02 18:03:55 weasel Exp $ # =pod @@ -29,7 +29,8 @@ sub send_requests() { for my $remailer (Echolot::Globals::get()->{'storage'}->get_addresses()) { next unless ($remailer->{'status'} eq 'active'); next unless ($remailer->{'fetch'}); - print "Sending requests to ".$remailer->{'address'}."\n"; + print "Sending requests to ".$remailer->{'address'}."\n" + if Echolot::Config::get()->{'verbose'}; for my $type (qw{conf key help stats}) { Echolot::Tools::send_message( 'To' => $remailer->{'address'}, @@ -68,6 +69,20 @@ sub remailer_conf($$$) { } else { Echolot::Globals::get()->{'storage'}->restore_ttl( $remailer->{'address'} ); Echolot::Globals::get()->{'storage'}->set_caps($remailer_type, $remailer_caps, $remailer_nick, $remailer_address, $time); + + # if remailer is cpunk and not pgponly + if (($remailer_caps =~ /\bcpunk\b/) && !($remailer_caps =~ /\bpgponly\b/)) { + Echolot::Globals::get()->{'storage'}->set_key( + 'cpunk-clear', + $remailer_nick, + $remailer->{'address'}, + 'N/A', + 'none', + 'N/A', + 'N/A', + 'N/A', + $time); + } } @@ -192,9 +207,9 @@ sub parse_cpunk_key($$$) { my @pgp_keys = ($reply =~ /^-----BEGIN \s PGP \s PUBLIC \s KEY \s BLOCK-----\r?\n (?:.+\r?\n)* - \r?\n - (?:[a-zA-Z0-9+\/=]*\r?\n)+ - -----END \s PGP \s PUBLIC \s KEY \s BLOCK-----$/xmg ); + \r?\n + (?:[a-zA-Z0-9+\/=]*\r?\n)+ + -----END \s PGP \s PUBLIC \s KEY \s BLOCK-----$/xmg ); for my $key (@pgp_keys) { my ( $stdin_fh, $stdout_fh, $stderr_fh, $status_fh ) = ( IO::Handle->new(), |