From b41df90904849dac46beca728bd23f277e180ffb Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 22 Jul 2002 02:18:30 +0000
Subject: =?UTF-8?q?You=20no=20longer=20need=20an=20extra=20Mixmaster=20ins?=
 =?UTF-8?q?tallation=20for=20your=20pinger=20The=20config=20hash=20?=
 =?UTF-8?q?=EF=BF=BDPinger::Mix=EF=BF=BD=20is=20obsolete=20Default=20gnupg?=
 =?UTF-8?q?home=20changed=20from=20=EF=BF=BDgnupg=EF=BF=BD=20to=20?=
 =?UTF-8?q?=EF=BF=BDgnupghome=EF=BF=BD=20New=20config=20options:=20mixmast?=
 =?UTF-8?q?er,=20mixhome,=20gnupg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Echolot/Pinger/CPunk.pm |  3 ++-
 Echolot/Pinger/Mix.pm   | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'Echolot/Pinger')

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;
-- 
cgit v1.2.3