From owner-svn-src-all@FreeBSD.ORG  Sat Jul 30 17:44:07 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 31344106566C;
	Sat, 30 Jul 2011 17:44:07 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2069F8FC13;
	Sat, 30 Jul 2011 17:44:07 +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 p6UHi6eq009409;
	Sat, 30 Jul 2011 17:44:06 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6UHi6s3009407;
	Sat, 30 Jul 2011 17:44:06 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201107301744.p6UHi6s3009407@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sat, 30 Jul 2011 17:44:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224525 -
	head/cddl/contrib/opensolaris/lib/libzfs/common
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jul 2011 17:44:07 -0000

Author: mm
Date: Sat Jul 30 17:44:06 2011
New Revision: 224525
URL: http://svn.freebsd.org/changeset/base/224525

Log:
  Fix wrong initialization of "cmd" for calling the jail/unjail ioctl.
  
  Reviewed by:	pjd@, delphij@
  Approved by:	re (kib)
  MFC after:	3 days

Modified:
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sat Jul 30 17:40:11 2011	(r224524)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sat Jul 30 17:44:06 2011	(r224525)
@@ -4289,7 +4289,8 @@ zfs_jail(zfs_handle_t *zhp, int jailid, 
 	libzfs_handle_t *hdl = zhp->zfs_hdl;
 	zfs_cmd_t zc = { 0 };
 	char errbuf[1024];
-	int cmd, ret;
+	unsigned long cmd;
+	int ret;
 
 	if (attach) {
 		(void) snprintf(errbuf, sizeof (errbuf),