Allow a ppp_user specification to run ppp at startup

PR:		20258

5 files changed, 45 insertions, 40 deletions

diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 1c38d05..2ba323e 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -138,7 +138,7 @@ network_pass1() {
 		;;
 	esac
 
-	# Warm up user ppp if required, must happen before natd.
+	# Start user ppp if required.  This must happen before natd.
 	#
 	case ${ppp_enable} in
 	[Yy][Ee][Ss])
@@ -147,27 +147,28 @@ network_pass1() {
 		if [ "${ppp_mode}" != "ddial" -a "${ppp_mode}" != "direct" \
 			-a "${ppp_mode}" != "dedicated" \
 			-a "${ppp_mode}" != "background" ]; then
-			ppp_mode="auto";
+			ppp_mode="auto"
 		fi
 
-		ppp_command="-${ppp_mode} ";
+		ppp_command="/usr/sbin/ppp -quiet -${ppp_mode}"
 
-		# Switch on alias mode?
+		# Switch on NAT mode?
 		#
 		case ${ppp_nat} in
 		[Yy][Ee][Ss])
-			ppp_command="${ppp_command} -nat";
+			ppp_command="${ppp_command} -nat"
 			;;
 		esac
 
-		echo -n 'Starting ppp: '; ppp ${ppp_command} -quiet ${ppp_profile}
+		ppp_command="${ppp_command} ${ppp_profile}"
+
+		echo -n "Starting ppp as \"${ppp_user}\""
+		su ${ppp_user} -c "exec ${ppp_command}"
 		;;
 	esac
 
 	# Initialize IP filtering using ipfw
 	#
-	echo ''
-
 	if /sbin/ipfw -q flush > /dev/null 2>&1; then
 		firewall_in_kernel=1
 	else
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 1c38d05..2ba323e 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -138,7 +138,7 @@ network_pass1() {
 		;;
 	esac
 
-	# Warm up user ppp if required, must happen before natd.
+	# Start user ppp if required.  This must happen before natd.
 	#
 	case ${ppp_enable} in
 	[Yy][Ee][Ss])
@@ -147,27 +147,28 @@ network_pass1() {
 		if [ "${ppp_mode}" != "ddial" -a "${ppp_mode}" != "direct" \
 			-a "${ppp_mode}" != "dedicated" \
 			-a "${ppp_mode}" != "background" ]; then
-			ppp_mode="auto";
+			ppp_mode="auto"
 		fi
 
-		ppp_command="-${ppp_mode} ";
+		ppp_command="/usr/sbin/ppp -quiet -${ppp_mode}"
 
-		# Switch on alias mode?
+		# Switch on NAT mode?
 		#
 		case ${ppp_nat} in
 		[Yy][Ee][Ss])
-			ppp_command="${ppp_command} -nat";
+			ppp_command="${ppp_command} -nat"
 			;;
 		esac
 
-		echo -n 'Starting ppp: '; ppp ${ppp_command} -quiet ${ppp_profile}
+		ppp_command="${ppp_command} ${ppp_profile}"
+
+		echo -n "Starting ppp as \"${ppp_user}\""
+		su ${ppp_user} -c "exec ${ppp_command}"
 		;;
 	esac
 
 	# Initialize IP filtering using ipfw
 	#
-	echo ''
-
 	if /sbin/ipfw -q flush > /dev/null 2>&1; then
 		firewall_in_kernel=1
 	else
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 1c38d05..2ba323e 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -138,7 +138,7 @@ network_pass1() {
 		;;
 	esac
 
-	# Warm up user ppp if required, must happen before natd.
+	# Start user ppp if required.  This must happen before natd.
 	#
 	case ${ppp_enable} in
 	[Yy][Ee][Ss])
@@ -147,27 +147,28 @@ network_pass1() {
 		if [ "${ppp_mode}" != "ddial" -a "${ppp_mode}" != "direct" \
 			-a "${ppp_mode}" != "dedicated" \
 			-a "${ppp_mode}" != "background" ]; then
-			ppp_mode="auto";
+			ppp_mode="auto"
 		fi
 
-		ppp_command="-${ppp_mode} ";
+		ppp_command="/usr/sbin/ppp -quiet -${ppp_mode}"
 
-		# Switch on alias mode?
+		# Switch on NAT mode?
 		#
 		case ${ppp_nat} in
 		[Yy][Ee][Ss])
-			ppp_command="${ppp_command} -nat";
+			ppp_command="${ppp_command} -nat"
 			;;
 		esac
 
-		echo -n 'Starting ppp: '; ppp ${ppp_command} -quiet ${ppp_profile}
+		ppp_command="${ppp_command} ${ppp_profile}"
+
+		echo -n "Starting ppp as \"${ppp_user}\""
+		su ${ppp_user} -c "exec ${ppp_command}"
 		;;
 	esac
 
 	# Initialize IP filtering using ipfw
 	#
-	echo ''
-
 	if /sbin/ipfw -q flush > /dev/null 2>&1; then
 		firewall_in_kernel=1
 	else
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index 1c38d05..2ba323e 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -138,7 +138,7 @@ network_pass1() {
 		;;
 	esac
 
-	# Warm up user ppp if required, must happen before natd.
+	# Start user ppp if required.  This must happen before natd.
 	#
 	case ${ppp_enable} in
 	[Yy][Ee][Ss])
@@ -147,27 +147,28 @@ network_pass1() {
 		if [ "${ppp_mode}" != "ddial" -a "${ppp_mode}" != "direct" \
 			-a "${ppp_mode}" != "dedicated" \
 			-a "${ppp_mode}" != "background" ]; then
-			ppp_mode="auto";
+			ppp_mode="auto"
 		fi
 
-		ppp_command="-${ppp_mode} ";
+		ppp_command="/usr/sbin/ppp -quiet -${ppp_mode}"
 
-		# Switch on alias mode?
+		# Switch on NAT mode?
 		#
 		case ${ppp_nat} in
 		[Yy][Ee][Ss])
-			ppp_command="${ppp_command} -nat";
+			ppp_command="${ppp_command} -nat"
 			;;
 		esac
 
-		echo -n 'Starting ppp: '; ppp ${ppp_command} -quiet ${ppp_profile}
+		ppp_command="${ppp_command} ${ppp_profile}"
+
+		echo -n "Starting ppp as \"${ppp_user}\""
+		su ${ppp_user} -c "exec ${ppp_command}"
 		;;
 	esac
 
 	# Initialize IP filtering using ipfw
 	#
-	echo ''
-
 	if /sbin/ipfw -q flush > /dev/null 2>&1; then
 		firewall_in_kernel=1
 	else
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 1c38d05..2ba323e 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -138,7 +138,7 @@ network_pass1() {
 		;;
 	esac
 
-	# Warm up user ppp if required, must happen before natd.
+	# Start user ppp if required.  This must happen before natd.
 	#
 	case ${ppp_enable} in
 	[Yy][Ee][Ss])
@@ -147,27 +147,28 @@ network_pass1() {
 		if [ "${ppp_mode}" != "ddial" -a "${ppp_mode}" != "direct" \
 			-a "${ppp_mode}" != "dedicated" \
 			-a "${ppp_mode}" != "background" ]; then
-			ppp_mode="auto";
+			ppp_mode="auto"
 		fi
 
-		ppp_command="-${ppp_mode} ";
+		ppp_command="/usr/sbin/ppp -quiet -${ppp_mode}"
 
-		# Switch on alias mode?
+		# Switch on NAT mode?
 		#
 		case ${ppp_nat} in
 		[Yy][Ee][Ss])
-			ppp_command="${ppp_command} -nat";
+			ppp_command="${ppp_command} -nat"
 			;;
 		esac
 
-		echo -n 'Starting ppp: '; ppp ${ppp_command} -quiet ${ppp_profile}
+		ppp_command="${ppp_command} ${ppp_profile}"
+
+		echo -n "Starting ppp as \"${ppp_user}\""
+		su ${ppp_user} -c "exec ${ppp_command}"
 		;;
 	esac
 
 	# Initialize IP filtering using ipfw
 	#
-	echo ''
-
 	if /sbin/ipfw -q flush > /dev/null 2>&1; then
 		firewall_in_kernel=1
 	else