svn commit: r206799 - stable/8/cddl/contrib/opensolaris/lib/libzfs/common

[Edward Tomasz Napierala]

Author: trasz
Date: Sun Apr 18 16:36:38 2010
New Revision: 206799
URL: http://svn.freebsd.org/changeset/base/206799

Log:
  MFC r197859:
  
  'aclmode' and 'aclinherit' properties should work as advertised; don't
  refuse to set them.

Modified:
  stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Directory Properties:
  stable/8/cddl/contrib/opensolaris/lib/libzfs/   (props changed)

Modified: stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sun Apr 18 12:50:26 2010	(r206798)
+++ stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sun Apr 18 16:36:38 2010	(r206799)
@@ -1792,8 +1792,6 @@ zfs_prop_set(zfs_handle_t *zhp, const ch
 	switch (prop) {
 	case ZFS_PROP_SHAREISCSI:
 	case ZFS_PROP_DEVICES:
-	case ZFS_PROP_ACLMODE:
-	case ZFS_PROP_ACLINHERIT:
 	case ZFS_PROP_ISCSIOPTIONS:
 		(void) snprintf(errbuf, sizeof (errbuf),
 		    "property '%s' not supported on FreeBSD", propname);