From bddbe3b2b13a54968d93e93411de50706db39cc7 Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Thu, 17 Nov 2016 22:49:51 +0000
Subject: [PATCH] rc.subr: Swap checks so we only fork sysctl if *_oomprotect
 is set.

---
 etc/rc.subr | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/etc/rc.subr b/etc/rc.subr
index 0201f0595c6..7eaa13a9401 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -1206,22 +1206,17 @@ $command $rc_flags $command_args"
 		case "$rc_arg" in
 		start)
 			# We cannot use protect(1) inside jails.
-			jailed="$(sysctl -n security.jail.jailed)"
-			if [ ${jailed} -eq 1 ]; then
-				return $_return
-			fi
-			if [ -n "$_oomprotect" ]; then
-				if [ -f "${PROTECT}" ]; then
-					pid=$(check_process $command)
-					case $_oomprotect in
-					[Aa][Ll][Ll])
-						${PROTECT} -i -p ${pid}
-						;;
-					[Yy][Ee][Ss])
-						${PROTECT} -p ${pid}
-						;;
-					esac
-				fi
+			if [ -n "$_oomprotect" ] && [ -f "${PROTECT}" ] &&
+			    [ "$(sysctl -n security.jail.jailed)" -eq 0 ]; then
+				pid=$(check_process $command)
+				case $_oomprotect in
+				[Aa][Ll][Ll])
+					${PROTECT} -i -p ${pid}
+					;;
+				[Yy][Ee][Ss])
+					${PROTECT} -p ${pid}
+					;;
+				esac
 			fi	
 		;;
 		esac
-- 
2.45.2