d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC: Add a new rc.conf variable, sendmail_rebuild_aliases, which tells

Browse Source 
/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

     Revision  Changes    Path
     1.316     +1 -0      src/etc/defaults/rc.conf
     1.17      +10 -8     src/etc/rc.d/sendmail
     1.1039    +6 -0      src/release/doc/en_US.ISO8859-1/relnotes/article.sgml
This commit is contained in:
gshapiro 2007-06-15 02:39:36 +00:00
parent e7c59ea317
commit 38d3d614c9
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/defaults/rc.conf
View File

@ -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).
##############################################################

18
etc/rc.d/sendmail
View File

@ -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
}

11
release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
View File

@ -307,6 +307,17 @@
generates a 256-bit pre-shared WPA key from an ASCII
passphrase.</para>
<sect3 id="rc-scripts">
<title><filename>/etc/rc.d</filename> Scripts</title>
<para>The <filename>sendmail</filename> script can be instructed
not to rebuild the aliases database if it is missing or older than
the aliases file. If desired, set the new rc.conf option
<varname>sendmail_rebuild_aliases</varname> to "NO" to turn off
that functionality.</para>
</sect3>
</sect2>
<sect2 id="contrib">