IFC @238412.

11 files changed, 23 insertions, 20 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 078e490a4164..48124b94878e 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -7,8 +7,7 @@
 SUBDIR=	sendmail
 .endif
 
-BIN1=	auth.conf \
-	crontab \
+BIN1=	crontab \
 	devd.conf \
 	devfs.conf \
 	ddb.conf \
diff --git a/etc/auth.conf b/etc/auth.conf
deleted file mode 100644
index 08b6f7a3271f..000000000000
--- a/etc/auth.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# $FreeBSD$
-#
-# Configure some authentication-related defaults.  This file is being
-# gradually subsumed by user class and PAM configuration.
-#
-
-# crypt_default	=	md5 des
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 2437d4247c5e..07f1173130fa 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -127,6 +127,7 @@ firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall
 firewall_type="UNKNOWN"		# Firewall type (see /etc/rc.firewall)
 firewall_quiet="NO"		# Set to YES to suppress rule display
 firewall_logging="NO"		# Set to YES to enable events logging
+firewall_logif="NO"		# Set to YES to create logging-pseudo interface
 firewall_flags=""		# Flags passed to ipfw when type is a file
 firewall_coscripts=""		# List of executables/scripts to run after
 				# firewall starts/stops
diff --git a/etc/devd.conf b/etc/devd.conf
index 27abc1f597a7..fa9ed986b4b9 100644
--- a/etc/devd.conf
+++ b/etc/devd.conf
@@ -320,7 +320,7 @@ notify 10 {
 notify 0 {
 	match "system"		"RCTL";
 	match "rule"		"user:70:swap:.*";
-	action			"/usr/local/etc/rc.d/postgresql restart"
+	action			"/usr/local/etc/rc.d/postgresql restart";
 };
 
 */
diff --git a/etc/login.conf b/etc/login.conf
index a454758decd0..c62687a65101 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -23,10 +23,10 @@
 # AND SEMANTICS'' section of getcap(3) for more escape sequences).
 
 default:\
-	:passwd_format=md5:\
+	:passwd_format=sha512:\
 	:copyright=/etc/COPYRIGHT:\
 	:welcome=/etc/motd:\
-	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,FTP_PASSIVE_MODE=YES:\
+	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\
 	:path=/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin ~/bin:\
 	:nologin=/var/run/nologin:\
 	:cputime=unlimited:\
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index c2a0e912ace5..637ec037e6e8 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -102,6 +102,8 @@
         ..
         ciss
         ..
+        filemon
+        ..
         firewire
         ..
         hwpmc
diff --git a/etc/periodic/daily/400.status-disks b/etc/periodic/daily/400.status-disks
index dc525a5bccac..dd828aaaf39a 100755
--- a/etc/periodic/daily/400.status-disks
+++ b/etc/periodic/daily/400.status-disks
@@ -19,12 +19,15 @@ case "$daily_status_disks_enable" in
 	df $daily_status_disks_df_flags && rc=1 || rc=3
 
 	# display which filesystems need backing up
-	if ! [ -f /etc/fstab ]; then
-		export PATH_FSTAB=/dev/null
-	fi
+	if [ -s /etc/dumpdates ]; then
+		if ! [ -f /etc/fstab ]; then
+			export PATH_FSTAB=/dev/null
+		fi
 
-	echo ""
-	dump W || rc=3;;
+		echo ""
+		dump W || rc=3
+	fi
+	;;
 
     *)  rc=0;;
 esac
diff --git a/etc/rc.d/ipfw b/etc/rc.d/ipfw
index 4beb609cb8d4..625d07dd49a4 100755
--- a/etc/rc.d/ipfw
+++ b/etc/rc.d/ipfw
@@ -57,6 +57,10 @@ ipfw_start()
 		echo 'Firewall logging enabled.'
 		sysctl net.inet.ip.fw.verbose=1 >/dev/null
 	fi
+	if checkyesno firewall_logif; then
+		ifconfig ipfw0 create
+		echo 'Firewall logging pseudo-interface (ipfw0) created.'
+	fi
 }
 
 ipfw_poststart()
diff --git a/etc/rc.d/jail b/etc/rc.d/jail
index 72ab62ee876e..f5b8f311c1ac 100755
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -641,7 +641,7 @@ jail_start()
 			i=$((i + 1))
 		done
 
-		eval ${_setfib} jail ${_flags} -i ${_rootdir} ${_hostname} \
+		eval ${_setfib} jail ${_flags} -n ${_jail} -i ${_rootdir} ${_hostname} \
 			\"${_addrl}\" ${_exec_start} > ${_tmp_jail} 2>&1 \
 			</dev/null
 
diff --git a/etc/rc.d/rarpd b/etc/rc.d/rarpd
index db5f0c4c8c49..9dffe4302fb2 100755
--- a/etc/rc.d/rarpd
+++ b/etc/rc.d/rarpd
@@ -13,8 +13,9 @@
 name="rarpd"
 rcvar="rarpd_enable"
 command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
 required_files="/etc/ethers"
 
 load_rc_config $name
+pidfile="${rarpd_pidfile:-/var/run/${name}.pid}"
+
 run_rc_command "$1"
diff --git a/etc/syslog.conf b/etc/syslog.conf
index be96831d254c..242d27aff75b 100644
--- a/etc/syslog.conf
+++ b/etc/syslog.conf
@@ -16,6 +16,7 @@ cron.*						/var/log/cron
 *.=debug					/var/log/debug.log
 *.emerg						*
 # uncomment this to log all writes to /dev/console to /var/log/console.log
+# touch /var/log/console.log and chmod it to mode 600 before it will work
 #console.info					/var/log/console.log
 # uncomment this to enable logging of all log messages to /var/log/all.log
 # touch /var/log/all.log and chmod it to mode 600 before it will work