21 lines
704 B
Plaintext
21 lines
704 B
Plaintext
--- archive2.pl.orig Fri Jan 7 12:00:49 2000
|
|
+++ archive2.pl Wed Feb 2 13:31:41 2011
|
|
@@ -50,7 +50,7 @@ chdir($ENV{'HOME'}) if $ENV{'HOME'};
|
|
# Read and execute the .cf file
|
|
$cf = $ENV{"MAJORDOMO_CF"} || "/etc/majordomo.cf";
|
|
if ($ARGV[0] eq "-C") {
|
|
- $cf = $ARGV[1];
|
|
+ $cf = "$ENV{'MAJORDOMO_CFDIR'}/$ARGV[1]" unless $ARGV[1] =~ /\//;
|
|
shift(@ARGV);
|
|
shift(@ARGV);
|
|
}
|
|
@@ -88,7 +88,7 @@ if (!defined($opt_f)) {
|
|
exit 1;
|
|
}
|
|
|
|
-$sendmail_command = $sendmail_command || "/usr/lib/sendmail";
|
|
+$sendmail_command = $sendmail_command || "/usr/sbin/sendmail";
|
|
$bounce_mailer = $bounce_mailer || "$sendmail_command -f\$sender -t";
|
|
&set_abort_addr($whoami_owner);
|
|
&set_mail_from($whoami);
|