pivy-zfs: cope with PROP_KEYSTATUS id number changing on illumos

in r151050 the zfs crypto zprops were re-numbered, so this code
needs to use function calls to get the right numbers out of the
library instead if we want it to work on older builds as well

Author: arekinath

pivy-zfs.c

@@ -55,6 +55,7 @@
 
 #include <libzfs.h>
 #include <libzfs_core.h>
+#include <sys/fs/zfs.h>
 #include <sys/spa_impl.h>
 #include <libnvpair.h>
 #include <sys/dmu.h>
@@ -85,6 +86,22 @@ const char *PROP_JOYENT = "com.joyent.kbm:ebox";
 
 static void usage(void);
 
+static int zprop_keystatus;
+static uint64_t keystatus_available;
+
+static void
+load_keystatus(void)
+{
+	int rc;
+	zprop_keystatus = zfs_name_to_prop("keystatus");
+	rc = zfs_prop_string_to_index(zprop_keystatus, "available",
+	    &keystatus_available);
+#if defined(DMU_OT_ENCRYPTED)
+	VERIFY(zprop_keystatus != ZPROP_INVAL);
+	VERIFY(rc != -1);
+#endif
+}
+
 static errf_t *
 unlock_or_recover(struct ebox *ebox, const char *descr, boolean_t *recovered)
 {
@@ -235,6 +252,8 @@ cmd_unlock(const char *fsname)
 	uint64_t kstatus;
 #endif
 
+	load_keystatus();
+
 	ds = zfs_open(zfshdl, fsname, ZFS_TYPE_DATASET);
 	if (ds == NULL)
 		err(EXIT_ERROR, "failed to open dataset %s", fsname);
@@ -243,9 +262,9 @@ cmd_unlock(const char *fsname)
 	VERIFY(props != NULL);
 
 #if defined(DMU_OT_ENCRYPTED)
-	kstatus = zfs_prop_get_int(ds, ZFS_PROP_KEYSTATUS);
+	kstatus = zfs_prop_get_int(ds, zprop_keystatus);
 
-	if (kstatus == ZFS_KEYSTATUS_AVAILABLE) {
+	if (kstatus == keystatus_available) {
 		errx(EXIT_ALREADY_UNLOCKED, "key already loaded for %s",
 		    fsname);
 	}
@@ -420,6 +439,8 @@ cmd_rekey(const char *fsname)
 	nvlist_t *nprops;
 #endif
 
+	load_keystatus();
+
 	ds = zfs_open(zfshdl, fsname, ZFS_TYPE_DATASET);
 	if (ds == NULL)
 		err(EXIT_ERROR, "failed to open dataset %s", fsname);
@@ -468,9 +489,9 @@ cmd_rekey(const char *fsname)
 	}
 
 #if defined(DMU_OT_ENCRYPTED)
-	kstatus = zfs_prop_get_int(ds, ZFS_PROP_KEYSTATUS);
+	kstatus = zfs_prop_get_int(ds, zprop_keystatus);
 
-	if (kstatus != ZFS_KEYSTATUS_AVAILABLE) {
+	if (kstatus != keystatus_available) {
 #endif
 		(void) mlockall(MCL_CURRENT | MCL_FUTURE);
 		if ((error = unlock_or_recover(ebox, description, &recovered)))
@@ -480,7 +501,7 @@ cmd_rekey(const char *fsname)
 
 #if defined(DMU_OT_ENCRYPTED)
 		rc = lzc_load_key(fsname, B_FALSE, (uint8_t *)key, keylen);
-		if (rc != 0) {
+		if (rc != 0 && rc != EEXIST) {
 			errno = rc;
 			err(EXIT_ERROR, "failed to load key material into "
 			    "ZFS for %s", fsname);

slot-spec.c

@@ -84,7 +84,7 @@ slotspec_clear_all(struct slotspec *spec)
 }
 
 
-#line 88 "slot-spec.c"
+#line 83 "slot-spec.c"
 static const char _slotspec_actions[] = {
 	0, 1, 3, 1, 6, 2, 0, 3, 
 	2, 2, 5, 2, 4, 5, 2, 6, 
@@ -179,14 +179,14 @@ slotspec_parse_pe(struct slotspec *spec, const char *p, const char *pe)
 	int cs;
 
 
-#line 183 "slot-spec.c"
+#line 174 "slot-spec.c"
 	{
 	cs = slotspec_start;
 	}
 
 #line 150 "slot-spec.rl"
 
-#line 190 "slot-spec.c"
+#line 177 "slot-spec.c"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -325,7 +325,7 @@ slotspec_parse_pe(struct slotspec *spec, const char *p, const char *pe)
 	    "(expected '!' and then a slot)", p - 1));
 }
 	break;
-#line 329 "slot-spec.c"
+#line 307 "slot-spec.c"
 		}
 	}
 
@@ -398,7 +398,7 @@ slotspec_parse_pe(struct slotspec *spec, const char *p, const char *pe)
 	    "(expected '!' and then a slot)", p - 1));
 }
 	break;
-#line 402 "slot-spec.c"
+#line 373 "slot-spec.c"
 		}
 	}
 	}