diff options
| author | Peter Palfrader <peter@palfrader.org> | 2002-07-22 02:18:30 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2002-07-22 02:18:30 +0000 |
| commit | b41df90904849dac46beca728bd23f277e180ffb (patch) | |
| tree | cd07676d3acae734def9308d0e9c07e3b7f977a5 /Echolot/Pinger | |
| parent | a21e00e8907f6c21399ef797f9490c9402c56c7f (diff) | |
You no longer need an extra Mixmaster installation for your pinger
The config hash �Pinger::Mix� is obsolete
Default gnupghome changed from �gnupg� to �gnupghome�
New config options: mixmaster, mixhome, gnupg
Diffstat (limited to 'Echolot/Pinger')
| -rw-r--r-- | Echolot/Pinger/CPunk.pm | 3 | ||||
| -rw-r--r-- | Echolot/Pinger/Mix.pm | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Echolot/Pinger/CPunk.pm b/Echolot/Pinger/CPunk.pm index 598e13e..3265d26 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.5 2002/07/16 02:48:57 weasel Exp $ +# $Id: CPunk.pm,v 1.6 2002/07/22 02:18:30 weasel Exp $ # =pod @@ -35,6 +35,7 @@ sub encrypt_to($$$$) { Echolot::Globals::get()->{'hostname'}.".".time.'.'.$PROCESS_ID.'_'.Echolot::Globals::get()->{'internalcounter'}++.'.keyring'; my $GnuPG = new GnuPG::Interface; + $GnuPG->call( Echolot::Config::get()->{'gnupg'} ) if (Echolot::Config::get()->{'gnupg'}); $GnuPG->options->hash_init( homedir => Echolot::Config::get()->{'gnupghome'} ); $GnuPG->options->meta_interactive( 0 ); diff --git a/Echolot/Pinger/Mix.pm b/Echolot/Pinger/Mix.pm index d68147c..f41f217 100644 --- a/Echolot/Pinger/Mix.pm +++ b/Echolot/Pinger/Mix.pm @@ -1,7 +1,7 @@ package Echolot::Pinger::Mix; # (c) 2002 Peter Palfrader <peter@palfrader.org> -# $Id: Mix.pm,v 1.4 2002/07/16 02:48:57 weasel Exp $ +# $Id: Mix.pm,v 1.5 2002/07/22 02:18:30 weasel Exp $ # =pod @@ -25,7 +25,7 @@ sub ping($$$$) { my $chaincomma = join (',', @$chain); - my $keyring = Echolot::Config::get()->{'Pinger::Mix'}->{'mixdir'}.'/pubring.mix'; + my $keyring = Echolot::Config::get()->{'mixhome'}.'/pubring.mix'; open (F, '>'.$keyring) or cluck("Cannot open $keyring for writing: $!"), return 0; @@ -37,7 +37,7 @@ sub ping($$$$) { cluck("Cannot close $keyring"), return 0; - my $type2list = Echolot::Config::get()->{'Pinger::Mix'}->{'mixdir'}.'/type2.list'; + my $type2list = Echolot::Config::get()->{'mixhome'}.'/type2.list'; open (F, '>'.$type2list) or cluck("Cannot open $type2list for writing: $!"), return 0; @@ -48,10 +48,11 @@ sub ping($$$$) { cluck("Cannot close $type2list"), return 0; - open(MIX, "|".Echolot::Config::get()->{'Pinger::Mix'}->{'mix'}." -m -S -l $chaincomma") or + $ENV{'MIXPATH'} = Echolot::Config::get()->{'mixhome'}; + open(MIX, "|".Echolot::Config::get()->{'mixmaster'}." -m -S -l $chaincomma") or cluck("Cannot exec mixpinger: $!"), return 0; - print MIX "To: $to\n\n$body"; + print MIX "To: $to\n\n$body\n"; close (MIX); return 1; |