diff options
| author | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2007-06-15 02:39:36 +0000 |
|---|---|---|
| committer | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2007-06-15 02:39:36 +0000 |
| commit | 1a17b09de518b93e8f2d2f648f3152994566a006 (patch) | |
| tree | 58019bf89068c9d5b40d7326b691b87970f9940d /etc | |
| parent | c9513fb5d5c552e0918eede55c9d18e120d906dc (diff) | |
Notes
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 a61c4f73907d..6c79c664d582 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -484,6 +484,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="YES" # 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 } |