[Midnightbsd-cvs] src: etc/rc.d: Add new rc.conf var...

[laffer1 at midnightbsd.org]

Log Message:
-----------
Add new rc.conf var... sendmail_rebuild_aliases with a setting of off.

Aliases will no longer be rebuilt automatically on startup. (FreeBSD 7.x+ behavior)

Modified Files:
--------------
    src/etc/rc.d:
        sendmail (r1.3 -> r1.4)
    src/etc/defaults:
        rc.conf (r1.14 -> r1.15)

-------------- next part --------------
Index: sendmail
===================================================================
RCS file: /home/cvs/src/etc/rc.d/sendmail,v
retrieving revision 1.3
retrieving revision 1.4
diff -Letc/rc.d/sendmail -Letc/rc.d/sendmail -u -r1.3 -r1.4
--- etc/rc.d/sendmail
+++ etc/rc.d/sendmail
@@ -57,16 +57,18 @@
 	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
 }
 
Index: rc.conf
===================================================================
RCS file: /home/cvs/src/etc/defaults/rc.conf,v
retrieving revision 1.14
retrieving revision 1.15
diff -Letc/defaults/rc.conf -Letc/defaults/rc.conf -u -r1.14 -r1.15
--- etc/defaults/rc.conf
+++ etc/defaults/rc.conf
@@ -466,6 +466,7 @@
 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"	# will not rebuild aliases on startup automatically
 
 
 ##############################################################