From ec6ddea1a827de418d41a3091ec93c5900f505bb Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 19 Sep 2012 16:20:49 +0000
Subject: [PATCH] Allow zfs jail and zfs unjail to use both jailnames and
 jailid

Reviewed by:	pjd
MFC after:	1 month
---
 cddl/contrib/opensolaris/cmd/zfs/zfs.8      | 4 ++--
 cddl/contrib/opensolaris/cmd/zfs/zfs_main.c | 6 +++---
 cddl/sbin/zfs/Makefile                      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs.8 b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
index f83d6b47be1c..64a67e907259 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs.8
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
@@ -256,10 +256,10 @@
 .Op Ar snapshot Ns | Ns Ar filesystem
 .Nm
 .Cm jail
-.Ar jailid filesystem
+.Ar jailid Ns | Ns Ar jailname filesystem
 .Nm
 .Cm unjail
-.Ar jailid filesystem
+.Ar jailid Ns | Ns Ar jailname filesystem
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
index ff698a76e494..fd0f693e0733 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
@@ -6300,9 +6300,9 @@ do_jail(int argc, char **argv, int attach)
 		usage(B_FALSE);
 	}
 
-	jailid = atoi(argv[1]);
-	if (jailid == 0) {
-		(void) fprintf(stderr, gettext("invalid jailid\n"));
+	jailid = jail_getid(argv[1]);
+	if (jailid < 0) {
+		(void) fprintf(stderr, gettext("invalid jail id or name\n"));
 		usage(B_FALSE);
 	}
 
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index 4d3c51970567..95a476b7a512 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -21,8 +21,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 
-DPADD=	${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \
+DPADD=	${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
 	${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lgeom -lnvpair -lumem -lutil -luutil -lzfs
+LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs
 
 .include <bsd.prog.mk>