From owner-freebsd-rc@FreeBSD.ORG  Fri Oct 13 03:33:45 2006
Return-Path: <owner-freebsd-rc@FreeBSD.ORG>
X-Original-To: freebsd-rc@FreeBSD.org
Delivered-To: freebsd-rc@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6795E16A40F;
	Fri, 13 Oct 2006 03:33:45 +0000 (UTC)
	(envelope-from clsung@FreeBSD.csie.nctu.edu.tw)
Received: from FreeBSD.csie.nctu.edu.tw (freebsd.csie.nctu.edu.tw
	[140.113.17.209])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 66FBE43D4C;
	Fri, 13 Oct 2006 03:33:44 +0000 (GMT)
	(envelope-from clsung@FreeBSD.csie.nctu.edu.tw)
Received: from localhost (localhost.csie.nctu.edu.tw [127.0.0.1])
	by FreeBSD.csie.nctu.edu.tw (Postfix) with ESMTP id 011347E952;
	Fri, 13 Oct 2006 11:34:09 +0800 (CST)
Received: from FreeBSD.csie.nctu.edu.tw ([127.0.0.1])
	by localhost (FreeBSD.csie.nctu.edu.tw [127.0.0.1]) (amavisd-new,
	port 10024)
	with ESMTP id t3f1WHIBQSem; Fri, 13 Oct 2006 11:34:08 +0800 (CST)
Received: by FreeBSD.csie.nctu.edu.tw (Postfix, from userid 1038)
	id 724FF7E9BE; Fri, 13 Oct 2006 11:34:08 +0800 (CST)
Date: Fri, 13 Oct 2006 11:34:08 +0800
From: Cheng-Lung Sung <clsung@FreeBSD.org>
To: bug-followup@FreeBSD.org, llevier@argosnet.com
Message-ID: <20061013033408.GA30695@FreeBSD.csie.nctu.edu.tw>
MIME-Version: 1.0
Content-Type: text/plain; charset=big5
Content-Disposition: inline
X-Fingerprint: E0BC 57F9 F44B 46C6 DB53  8462 F807 89F3 956E 8BC1
X-Public-Key: http://sungsung.dragon2.net/pubring.asc
User-Agent: Mutt/1.5.13 (2006-08-11)
Cc: freebsd-current@freebsd.org, freebsd-rc@FreeBSD.org
Subject: Re: conf/102913: /etc/rc.d/named killall in jailed OS
X-BeenThere: freebsd-rc@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Discussion related to /etc/rc.d design and implementation."
	<freebsd-rc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-rc>,
	<mailto:freebsd-rc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-rc>
List-Post: <mailto:freebsd-rc@freebsd.org>
List-Help: <mailto:freebsd-rc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-rc>,
	<mailto:freebsd-rc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Oct 2006 03:33:45 -0000

try this patch?

Index: etc/rc.d/named
===================================================================
RCS file: /home/ncvs/src/etc/rc.d/named,v
retrieving revision 1.26
diff -u -r1.26 named
--- etc/rc.d/named	20 Apr 2006 12:30:12 -0000	1.26
+++ etc/rc.d/named	13 Oct 2006 03:30:41 -0000
@@ -91,9 +91,28 @@
 	if rndc stop 2>/dev/null; then
 		echo .
 	else
-		echo -n ": rndc failed, trying killall: "
-		if killall named; then
-			echo .
+		echo -n ": rndc failed, trying "
+		# If we are not inside a jail, killall will kill named in jail
+		# If we are inside a jail, killall is safe
+		# 
+		if [ `$SYSCTL_N security.jail.jailed` -eq 1 ]; then
+			echo -n "killall: "
+			if killall named; then
+				echo .
+			fi
+		else
+			# If we're not in a jail, try to kill named from pidfile
+			# Otherwise see if we can get from ps
+			echo -n "kill pid: "
+			if [ -f ${pidfile} ]; then
+				kill -TERM `cat ${pidfile}`
+				echo .
+			else
+				for i in `ps -axo command,pid,jid | awk '/^[^ ]+named/{if ($NF == 0) {print $(NF-1)}}'`; do
+					kill -TERM ${i}
+					echo .
+				done
+			fi
 		fi
 	fi
 }

-- 
Cheng-Lung Sung - clsung@