From owner-svn-src-projects@FreeBSD.ORG  Wed Oct 27 16:35:23 2010
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 7BECF1065672;
	Wed, 27 Oct 2010 16:35:23 +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 6B83F8FC17;
	Wed, 27 Oct 2010 16:35:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9RGZNgD014371;
	Wed, 27 Oct 2010 16:35:23 GMT (envelope-from jamie@svn.freebsd.org)
Received: (from jamie@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9RGZNAg014369;
	Wed, 27 Oct 2010 16:35:23 GMT (envelope-from jamie@svn.freebsd.org)
Message-Id: <201010271635.o9RGZNAg014369@svn.freebsd.org>
From: Jamie Gritton <jamie@FreeBSD.org>
Date: Wed, 27 Oct 2010 16:35:23 +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: r214424 - 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, 27 Oct 2010 16:35:23 -0000

Author: jamie
Date: Wed Oct 27 16:35:23 2010
New Revision: 214424
URL: http://svn.freebsd.org/changeset/base/214424

Log:
  Don't assume either jid or name is set - they may not be from the
  command line.

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

Modified: projects/jailconf/usr.sbin/jail/jail.c
==============================================================================
--- projects/jailconf/usr.sbin/jail/jail.c	Wed Oct 27 16:22:54 2010	(r214423)
+++ projects/jailconf/usr.sbin/jail/jail.c	Wed Oct 27 16:35:23 2010	(r214424)
@@ -891,8 +891,7 @@ running_jid(struct cfjail *j, int dflag)
 	char *ep;
 	int jid;
 
-	pval = string_param(j->intparams[KP_JID]);
-	if (pval != NULL) {
+	if ((pval = string_param(j->intparams[KP_JID]))) {
 		if (!(jid = strtol(pval, &ep, 10)) || *ep) {
 			j->jid = -1;
 			return;
@@ -901,13 +900,15 @@ running_jid(struct cfjail *j, int dflag)
 		jiov[0].iov_len = sizeof("jid");
 		jiov[1].iov_base = &jid;
 		jiov[1].iov_len = sizeof(jid);
-	} else {
-		pval = string_param(j->intparams[KP_NAME]);
+	} else if ((pval = string_param(j->intparams[KP_NAME]))) {
 		*(const void **)&jiov[0].iov_base = "name";
 		jiov[0].iov_len = sizeof("name");
 		jiov[1].iov_len = strlen(pval) + 1;
 		jiov[1].iov_base = alloca(jiov[1].iov_len);
 		strcpy(jiov[1].iov_base, pval);
+	} else {
+		j->jid = -1;
+		return;
 	}
 	j->jid = jail_get(jiov, 2, dflag ? JAIL_DYING : 0);
 }