From d5b15ddbfc55578099b5b8ac7accdb1f1fbd6dff Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Mon, 22 Jan 2018 03:38:10 +0000
Subject: [PATCH] usr.sbin/service: Fix -j to not be order dependant

The introduced -j option is highly dependant on the ordering of arguments,
and it exhibited broken behavior in some other circumstances. Fix these
issues, and simplify the feature by removing the unneessary double parsing
of options.

Reviewed by:	jilles
Differential Revision:	https://reviews.freebsd.org/D13952
---
 usr.sbin/service/service.sh | 50 +++++++++++++------------------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/usr.sbin/service/service.sh b/usr.sbin/service/service.sh
index ccc092828c7..1927bc4629a 100755
--- a/usr.sbin/service/service.sh
+++ b/usr.sbin/service/service.sh
@@ -49,39 +49,9 @@ usage () {
 	echo ''
 }
 
-accepted_argstr='jehlrRv'
-
-# Only deal with the -j option here. If found, JAIL is set and the opt and
-# arg are shifted out. OPTIND is left untouched. We strip the -j option out
-# here because we'll be proxying this invocation through to the jail via
-# jls(8) instead of handling it ourselves.
-while getopts ${accepted_argstr} COMMAND_LINE_ARGUMENT ; do
-	case "${COMMAND_LINE_ARGUMENT}" in
-	j)	JAIL="$2" ; shift ; shift ;;
-	esac
-done
-
-# If -j was provided, then we pass everthing along to the jexec command
-# and execute `service` within the named JAIL. Provided that the jail
-# actually exists, as checked by `jls`.
-# We do this so that if the jail does exist, we can then return the exit
-# code of `jexec` and it should be the exit code of whatever ran in the jail.
-# There is a race condition here in that the jail might exist at `jls` time
-# and be gone by `jexec` time, but it shouldn't be a big deal.
-if [ -n "$JAIL" ]; then
-	/usr/sbin/jls -j "$JAIL" 2>/dev/null >/dev/null
-	if [ $? -ne 0 ]; then
-		echo "Jail '$JAIL' does not exist."
-		exit 1
-	fi
-
-	/usr/sbin/jexec -l "$JAIL" /usr/sbin/service $*
-	exit $?
-fi
-
-OPTIND=1
-while getopts ${accepted_argstr} COMMAND_LINE_ARGUMENT ; do
+while getopts 'j:ehlrRv' COMMAND_LINE_ARGUMENT ; do
 	case "${COMMAND_LINE_ARGUMENT}" in
+	j)	JAIL="${OPTARG}" ;;
 	e)	ENABLED=eopt ;;
 	h)	usage ; exit 0 ;;
 	l)	LIST=lopt ;;
@@ -93,6 +63,22 @@ while getopts ${accepted_argstr} COMMAND_LINE_ARGUMENT ; do
 done
 shift $(( $OPTIND - 1 ))
 
+if [ -n "${JAIL}" ]; then
+	# We need to rebuild the command line before passing it on.
+	# We do not send the -j argument into the jail.
+	args=""
+	[ -n "${ENABLED}" ] && args="${args} -e"
+	[ -n "${LIST}" ] && args="${args} -l"
+	[ -n "${RCORDER}" ] && args="${args} -r"
+	[ -n "${RESTART}" ] && args="${args} -R"
+	[ -n "${VERBOSE}" ] && args="${args} -v"
+
+	# Call jexec(8) with the rebuild args and any positional args that
+	# were left in $@
+	/usr/sbin/jexec -l "${JAIL}" /usr/sbin/service $args "$@"
+	exit $?
+fi
+
 if [ -n "$RESTART" ]; then
 	skip="-s nostart"
 	if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then