diff options
| author | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2007-06-12 17:33:23 +0000 |
|---|---|---|
| committer | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2007-06-12 17:33:23 +0000 |
| commit | 2bc2025c443422483c5b63a23f7dd3078b6703ca (patch) | |
| tree | a87980518ed2c57ddd4262104fc6b9377e4426ed /etc | |
| parent | 4f9929e80f673867f34257a2571612c55ed57dfe (diff) | |
| download | src-2bc2025c443422483c5b63a23f7dd3078b6703ca.tar.gz src-2bc2025c443422483c5b63a23f7dd3078b6703ca.zip | |
Add a new rc.conf variable, sendmail_rebuild_aliases, which tells
/etc/rc.d/sendmail whether or not to run newaliases if the database
is missing or the aliases text file is newer than aliases.db.
In my opinion, the aliases file should never be automatically rebuilt.
The current text form could represent a work in progress. Therefore,
in FreeBSD 7.0, this new option will default to "NO". When this rc.d
change is MFC'ed, it will need to remain "YES" to maintain backward
compatibility.
PR: conf/86252
Approved by: re (kensmith)
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=170618
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 1 | ||||
| -rwxr-xr-x | etc/rc.d/sendmail | 18 |
2 files changed, 11 insertions, 8 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 51671ecb9451..611d4a8f4556 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -483,6 +483,7 @@ sendmail_outbound_flags="-L sm-queue -q30m" # Flags to sendmail (outbound only) sendmail_msp_queue_enable="YES" # Dequeue stuck clientmqueue mail (YES/NO). sendmail_msp_queue_flags="-L sm-msp-queue -Ac -q30m" # Flags for sendmail_msp_queue daemon. +sendmail_rebuild_aliases="NO" # Run newaliases if necessary (YES/NO). ############################################################## diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail index ab7607327202..0e96f2c37983 100755 --- a/etc/rc.d/sendmail +++ b/etc/rc.d/sendmail @@ -58,16 +58,18 @@ sendmail_precmd() fi # check modifications on /etc/mail/aliases - if [ -f "/etc/mail/aliases.db" ]; then - if [ "/etc/mail/aliases" -nt "/etc/mail/aliases.db" ]; then + if checkyesno sendmail_rebuild_aliases; then + if [ -f "/etc/mail/aliases.db" ]; then + if [ "/etc/mail/aliases" -nt "/etc/mail/aliases.db" ]; then + echo \ + "${name}: /etc/mail/aliases newer than /etc/mail/aliases.db, regenerating" + /usr/bin/newaliases + fi + else echo \ - "${name}: /etc/mail/aliases newer than /etc/mail/aliases.db, regenerating" - /usr/bin/newaliases + "${name}: /etc/mail/aliases.db not present, generating" + /usr/bin/newaliases fi - else - echo \ - "${name}: /etc/mail/aliases.db not present, generating" - /usr/bin/newaliases fi } |