From owner-freebsd-rc@FreeBSD.ORG  Fri Oct 13 03:40:26 2006
Return-Path: <owner-freebsd-rc@FreeBSD.ORG>
X-Original-To: freebsd-rc@hub.freebsd.org
Delivered-To: freebsd-rc@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 339C916A403
	for <freebsd-rc@hub.freebsd.org>; Fri, 13 Oct 2006 03:40:26 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F167043D49
	for <freebsd-rc@hub.freebsd.org>; Fri, 13 Oct 2006 03:40:25 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k9D3ePdP074550
	for <freebsd-rc@freefall.freebsd.org>; Fri, 13 Oct 2006 03:40:25 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k9D3ePCF074549;
	Fri, 13 Oct 2006 03:40:25 GMT (envelope-from gnats)
Date: Fri, 13 Oct 2006 03:40:25 GMT
Message-Id: <200610130340.k9D3ePCF074549@freefall.freebsd.org>
To: freebsd-rc@FreeBSD.org
From: Cheng-Lung Sung <clsung@FreeBSD.org>
Cc: 
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
Reply-To: Cheng-Lung Sung <clsung@FreeBSD.org>
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:40:26 -0000

The following reply was made to PR conf/102913; it has been noted by GNATS.

From: Cheng-Lung Sung <clsung@FreeBSD.org>
To: bug-followup@FreeBSD.org, llevier@argosnet.com
Cc: freebsd-rc@FreeBSD.org, freebsd-current@freebsd.org
Subject: Re: conf/102913: /etc/rc.d/named killall in jailed OS
Date: Fri, 13 Oct 2006 11:34:08 +0800

 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@