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
This commit is contained in:
gshapiro 2007-06-12 17:33:23 +00:00
parent 48df7c2e40
commit 8487a6b582
4 changed files with 23 additions and 8 deletions

View File

@ -21,6 +21,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 7.x IS SLOW:
developers choose to disable these features on build machines
to maximize performance.
20070612:
By default, /etc/rc.d/sendmail no longer rebuilds the aliases
database if it is missing or older than the aliases file. If
desired, set the new rc.conf option sendmail_rebuild_aliases
to "YES" to restore that functionality.
20070612:
The IPv4 multicast socket code has been considerably modified, and
moved to the file sys/netinet/in_mcast.c. Initial support for the

View File

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

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
}

View File

@ -2037,6 +2037,12 @@ mdconfig_md1="-t vnode -f /var/foo.img"</programlisting>
<para>The <filename>ppp-user</filename> script has been renamed to
<filename>ppp</filename>. &merged;</para>
<para>The <filename>sendmail</filename> script no longer rebuilds
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 "YES" to restore
that functionality.</para>
<para>The <varname>removable_interfaces</varname> variable
has been removed.</para>