From owner-svn-src-projects@FreeBSD.ORG  Wed Jul  6 21:49:56 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6EF97106566C;
	Wed,  6 Jul 2011 21:49:56 +0000 (UTC)
	(envelope-from jamie@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5F3268FC1A;
	Wed,  6 Jul 2011 21:49:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p66Lnua5033250;
	Wed, 6 Jul 2011 21:49:56 GMT (envelope-from jamie@svn.freebsd.org)
Received: (from jamie@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p66Lnufg033248;
	Wed, 6 Jul 2011 21:49:56 GMT (envelope-from jamie@svn.freebsd.org)
Message-Id: <201107062149.p66Lnufg033248@svn.freebsd.org>
From: Jamie Gritton <jamie@FreeBSD.org>
Date: Wed, 6 Jul 2011 21:49:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223827 - projects/jailconf/usr.sbin/jail
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jul 2011 21:49:56 -0000

Author: jamie
Date: Wed Jul  6 21:49:56 2011
New Revision: 223827
URL: http://svn.freebsd.org/changeset/base/223827

Log:
  Don't report errors for the exit status of processes that are killed
  as part of jail removal (IP_STOP_TIMEOUT).
  
  Note a jail as "removed" even if it wasn't jail_remove() that did
  the deed, e.g. if it already went away because all its processes
  were killed.

Modified:
  projects/jailconf/usr.sbin/jail/command.c

Modified: projects/jailconf/usr.sbin/jail/command.c
==============================================================================
--- projects/jailconf/usr.sbin/jail/command.c	Wed Jul  6 21:40:48 2011	(r223826)
+++ projects/jailconf/usr.sbin/jail/command.c	Wed Jul  6 21:49:56 2011	(r223827)
@@ -150,11 +150,15 @@ finish_command(struct cfjail *j)
 	if (!(j->flags & JF_SLEEPQ))
 		return 0;
 	j->flags &= ~JF_SLEEPQ;
-	if (*j->comparam != IP_STOP_TIMEOUT) {
-		paralimit++;
-		if (!TAILQ_EMPTY(&runnable))
-			requeue(TAILQ_FIRST(&runnable), &ready);
+	if (*j->comparam == IP_STOP_TIMEOUT)
+	{
+		j->flags &= ~JF_TIMEOUT;
+		j->pstatus = 0;
+		return 0;
 	}
+	paralimit++;
+	if (!TAILQ_EMPTY(&runnable))
+		requeue(TAILQ_FIRST(&runnable), &ready);
 	error = 0;
 	if (j->flags & JF_TIMEOUT) {
 		j->flags &= ~JF_TIMEOUT;
@@ -270,8 +274,8 @@ run_command(struct cfjail *j)
 
 	case IP__OP:
 		if (down) {
-			if (jail_remove(j->jid) == 0 && verbose >= 0 &&
-			    (verbose > 0 || (j->flags & JF_STOP
+			(void)jail_remove(j->jid);
+			if (verbose > 0 || (verbose == 0 && (j->flags & JF_STOP
 			    ? note_remove : j->name != NULL)))
 			    jail_note(j, "removed\n");
 			j->jid = -1;