Add ipsec_enable and ipsec_file options to run IPSEC's setkey program

with the specified configuration file at the appropriate time.

etc/defaults/rc.conf

@@ -156,6 +156,8 @@ nis_yppasswdd_flags=""		# Flags to rpc.yppasswdd (if enabled).
 defaultrouter="NO"		# Set to default gateway (or NO).
 static_routes=""		# Set to static route list (or leave empty).
 gateway_enable="NO"		# Set to YES if this host will be a gateway.
+ipsec_enable="NO"		# Set to YES to run setkey on ipsec_file
+ipsec_file="/etc/ipsec.conf"	# Name of config file for setkey
 router_enable="NO"		# Set to YES to enable a routing daemon.
 router="routed"			# Name of routing daemon to use if enabled.
 router_flags="-q"		# Flags for routing daemon.

etc/network.subr

@@ -352,6 +352,17 @@ network_pass1() {
 	esac
 	echo '.'
 
+	case ${ipsec_enable} in
+	[Yy][Ee][Ss])
+		if [ -f ${ipsec_file} ]; then
+		    echo ' ipsec: enabled'
+		    setkey -f ${ipsec_file}
+		else
+		    echo ' ipsec: file not found'
+		fi
+		;;
+	esac
+
 	echo -n 'routing daemons:'
 	case ${router_enable} in
 	[Yy][Ee][Ss])

etc/rc.d/netoptions

@@ -352,6 +352,17 @@ network_pass1() {
 	esac
 	echo '.'
 
+	case ${ipsec_enable} in
+	[Yy][Ee][Ss])
+		if [ -f ${ipsec_file} ]; then
+		    echo ' ipsec: enabled'
+		    setkey -f ${ipsec_file}
+		else
+		    echo ' ipsec: file not found'
+		fi
+		;;
+	esac
+
 	echo -n 'routing daemons:'
 	case ${router_enable} in
 	[Yy][Ee][Ss])

etc/rc.d/network1

@@ -352,6 +352,17 @@ network_pass1() {
 	esac
 	echo '.'
 
+	case ${ipsec_enable} in
+	[Yy][Ee][Ss])
+		if [ -f ${ipsec_file} ]; then
+		    echo ' ipsec: enabled'
+		    setkey -f ${ipsec_file}
+		else
+		    echo ' ipsec: file not found'
+		fi
+		;;
+	esac
+
 	echo -n 'routing daemons:'
 	case ${router_enable} in
 	[Yy][Ee][Ss])

etc/rc.d/network2

@@ -352,6 +352,17 @@ network_pass1() {
 	esac
 	echo '.'
 
+	case ${ipsec_enable} in
+	[Yy][Ee][Ss])
+		if [ -f ${ipsec_file} ]; then
+		    echo ' ipsec: enabled'
+		    setkey -f ${ipsec_file}
+		else
+		    echo ' ipsec: file not found'
+		fi
+		;;
+	esac
+
 	echo -n 'routing daemons:'
 	case ${router_enable} in
 	[Yy][Ee][Ss])

etc/rc.d/network3

@@ -352,6 +352,17 @@ network_pass1() {
 	esac
 	echo '.'
 
+	case ${ipsec_enable} in
+	[Yy][Ee][Ss])
+		if [ -f ${ipsec_file} ]; then
+		    echo ' ipsec: enabled'
+		    setkey -f ${ipsec_file}
+		else
+		    echo ' ipsec: file not found'
+		fi
+		;;
+	esac
+
 	echo -n 'routing daemons:'
 	case ${router_enable} in
 	[Yy][Ee][Ss])

etc/rc.d/routing

@@ -352,6 +352,17 @@ network_pass1() {
 	esac
 	echo '.'
 
+	case ${ipsec_enable} in
+	[Yy][Ee][Ss])
+		if [ -f ${ipsec_file} ]; then
+		    echo ' ipsec: enabled'
+		    setkey -f ${ipsec_file}
+		else
+		    echo ' ipsec: file not found'
+		fi
+		;;
+	esac
+
 	echo -n 'routing daemons:'
 	case ${router_enable} in
 	[Yy][Ee][Ss])

etc/rc.network

@@ -352,6 +352,17 @@ network_pass1() {
 	esac
 	echo '.'
 
+	case ${ipsec_enable} in
+	[Yy][Ee][Ss])
+		if [ -f ${ipsec_file} ]; then
+		    echo ' ipsec: enabled'
+		    setkey -f ${ipsec_file}
+		else
+		    echo ' ipsec: file not found'
+		fi
+		;;
+	esac
+
 	echo -n 'routing daemons:'
 	case ${router_enable} in
 	[Yy][Ee][Ss])