summaryrefslogtreecommitdiff
path: root/mail/majordomo/files/patch-bh
diff options
context:
space:
mode:
Diffstat (limited to 'mail/majordomo/files/patch-bh')
-rw-r--r--mail/majordomo/files/patch-bh33
1 files changed, 30 insertions, 3 deletions
diff --git a/mail/majordomo/files/patch-bh b/mail/majordomo/files/patch-bh
index cbbee781ef40..77caae090df6 100644
--- a/mail/majordomo/files/patch-bh
+++ b/mail/majordomo/files/patch-bh
@@ -1,6 +1,33 @@
---- request-answer.orig Tue Dec 10 01:50:20 1996
-+++ request-answer Wed Sep 10 00:57:36 1997
-@@ -43,7 +43,7 @@
+--- request-answer.Dist Fri Jan 7 03:10:18 2000
++++ request-answer Sun Apr 16 23:15:50 2000
+@@ -20,10 +20,23 @@
+ shift(@ARGV);
+ shift(@ARGV);
+ }
+-if (! -r $cf) {
+- die("$cf not readable; stopped");
++
++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;
+ }
+-require "$cf";
+
+ chdir($homedir) || die("Can't chdir(\"$homedir\"): $!");
+ unshift(@INC, $homedir);
+@@ -51,7 +64,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.