diff options
| author | Steve Price <steve@FreeBSD.org> | 2000-05-29 18:17:39 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 2000-05-29 18:17:39 +0000 |
| commit | 5373fd28de9cdf3c9c80dfcea841d0c3c9d2bdb5 (patch) | |
| tree | 99a43c72d0c1590652517d529a4b9f9e6ca425c4 /mail/majordomo/files/patch-ac | |
| parent | Make the port work in the absence of X (diff) | |
Update to version 1.94.5.
PR: 17820
Submitted by: Doug Barton <DougB@gorean.org> and
Klaus Brunner <klaus@winf.htu.at>
Notes
Notes:
svn path=/head/; revision=28932
Diffstat (limited to 'mail/majordomo/files/patch-ac')
| -rw-r--r-- | mail/majordomo/files/patch-ac | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/mail/majordomo/files/patch-ac b/mail/majordomo/files/patch-ac index cfc5defc5595..ef2d21cd3e2a 100644 --- a/mail/majordomo/files/patch-ac +++ b/mail/majordomo/files/patch-ac @@ -1,15 +1,33 @@ ---- digest.orig Wed Aug 27 23:42:52 1997 -+++ digest Wed Sep 10 00:56:12 1997 -@@ -314,7 +314,7 @@ +--- 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"; - require "$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); -@@ -326,7 +326,7 @@ + +@@ -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. |