5373fd28de
PR: 17820 Submitted by: Doug Barton <DougB@gorean.org> and Klaus Brunner <klaus@winf.htu.at>
38 lines
1 KiB
Text
38 lines
1 KiB
Text
--- digest.Dist Fri Jan 7 03:04:34 2000
|
|
+++ digest Sun Apr 16 23:15:49 2000
|
|
@@ -323,8 +323,24 @@
|
|
} else {
|
|
# Read and execute the .cf file
|
|
$cf = $opt_c || $ENV{"MAJORDOMO_CF"} ||
|
|
- "/etc/majordomo.cf";
|
|
- require "$cf";
|
|
+ "%%PREFIX%%/majordomo/majordomo.cf";
|
|
+
|
|
+if (not sysopen CONFIG,$cf,O_RDONLY)
|
|
+{
|
|
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
|
|
+}
|
|
+elsif ((stat CONFIG)[4] != $>)
|
|
+{
|
|
+ die qq|Config file "$cf" not owned by effective UID.\n|;
|
|
+}
|
|
+elsif (eval(join '',<CONFIG>),$@)
|
|
+{
|
|
+ die qq|Unable to eval "$cf": $@.\n|;
|
|
+}
|
|
+else
|
|
+{
|
|
+ close CONFIG;
|
|
+}
|
|
|
|
chdir($homedir);
|
|
|
|
@@ -335,7 +351,7 @@
|
|
# Define all of the mailer properties:
|
|
# It is possible that one or both of $sendmail_command and $bounce_mailer
|
|
# are not defined, so we provide reasonable defaults.
|
|
-$sendmail_command = "/usr/lib/sendmail"
|
|
+$sendmail_command = "/usr/sbin/sendmail"
|
|
unless defined $sendmail_command;
|
|
$mailer = "$sendmail_command -oi -oee -f\$sender"
|
|
unless defined $mailer;
|