From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 4 Dec 2008 23:05:54 +0000 (-0800)
Subject: Refresh
X-Git-Tag: zfs-0.4.1~451^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1caa5db38503f20e415b325a652e482a6aeece73;p=zfs

Refresh
---

1caa5db38503f20e415b325a652e482a6aeece73
diff --cc zfs/lib/libzpool/zfs_ioctl.c
index 9c9dab5e9,b6ad57451..42189db8f
--- a/zfs/lib/libzpool/zfs_ioctl.c
+++ b/zfs/lib/libzpool/zfs_ioctl.c
@@@ -1417,14 -1460,18 +1462,20 @@@ zfs_set_prop_nvlist(const char *name, n
  			break;
  
  		case ZFS_PROP_SHARESMB:
- 			if (zpl_check_version(name, ZPL_VERSION_FUID))
+ 			if (zpl_earlier_version(name, ZPL_VERSION_FUID))
  				return (ENOTSUP);
  			break;
+ 
+ 		case ZFS_PROP_ACLINHERIT:
+ 			if (nvpair_type(elem) == DATA_TYPE_UINT64 &&
+ 			    nvpair_value_uint64(elem, &intval) == 0)
+ 				if (intval == ZFS_ACL_PASSTHROUGH_X &&
+ 				    zfs_earlier_version(name,
+ 				    SPA_VERSION_PASSTHROUGH_X))
+ 					return (ENOTSUP);
+ 		}
 +		default:
 +			break;
- 		}
- 		if ((error = zfs_secpolicy_setprop(name, prop, CRED())) != 0)
- 			return (error);
  	}
  
  	elem = NULL;