31 lines
1.3 KiB
Plaintext
31 lines
1.3 KiB
Plaintext
--- resend.orig Fri Jan 7 16:32:39 2000
|
|
+++ resend Wed Feb 2 13:31:41 2011
|
|
@@ -79,6 +79,9 @@ if (! defined($opt_l)) {
|
|
}
|
|
|
|
# Read and execute the .cf file
|
|
+$cfdir = $ENV{'MAJORDOMO_CFDIR'};
|
|
+$opt_C = ($opt_C && $opt_C !~ /\//) ? "$cfdir/$opt_C" : '';
|
|
+$opt_c = ($opt_c && $opt_c !~ /\//) ? "$cfdir/$opt_c" : '';
|
|
$cf = $opt_C || $opt_c || $ENV{"MAJORDOMO_CF"} || "/etc/majordomo.cf";
|
|
|
|
# Despite not having a place to send the remains of the body,
|
|
@@ -111,7 +114,7 @@ $opt_l =~ tr/A-Z/a-z/;
|
|
# XXX It is possible that owner-$opt_l won't be the right address, but we
|
|
# have little choice. Sending the bounces to $whoami_owner is an option,
|
|
# but might not clearly indicate the list name.
|
|
-$sendmail_command = $sendmail_command || "/usr/lib/sendmail";
|
|
+$sendmail_command = $sendmail_command || "/usr/sbin/sendmail";
|
|
$bounce_mailer = $bounce_mailer || "$sendmail_command -f\$sender -t";
|
|
&set_mail_from("owner-$opt_l");
|
|
&set_mail_sender("owner-$opt_l");
|
|
@@ -936,7 +939,7 @@ sub send_bounce {
|
|
else {
|
|
# Painful, but we have to provide some kind of backwards
|
|
# compatibility and this is what 1.93 used
|
|
- $mailcmd = "/usr/lib/sendmail -f$sender -t";
|
|
+ $mailcmd = "/usr/sbin/sendmail -f$sender -t";
|
|
}
|
|
|
|
# clean up the addresses, for use on the sendmail command line
|