7290 ZFS test suite needs to control what utilities it can run
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>

*** 23,42 ****
  #
  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/acl/acl_common.kshlib
  
  # check svc:/network/nis/client:default state
  # disable it if the state is ON
  # and the state will be restored during cleanup.ksh
! log_must $RM -f $NISSTAFILE
! if [[ "ON" == $($SVCS -H -o sta svc:/network/nis/client:default) ]]; then
!     log_must $SVCADM disable -t svc:/network/nis/client:default
!     log_must $TOUCH $NISSTAFILE
  fi
  
  cleanup_user_group
  
  # Add root group user
--- 23,46 ----
  #
  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
+ #
+ # Copyright (c) 2016 by Delphix. All rights reserved.
+ #
+ 
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/acl/acl_common.kshlib
  
  # check svc:/network/nis/client:default state
  # disable it if the state is ON
  # and the state will be restored during cleanup.ksh
! log_must rm -f $NISSTAFILE
! if [[ "ON" == $(svcs -H -o sta svc:/network/nis/client:default) ]]; then
!     log_must svcadm disable -t svc:/network/nis/client:default
!     log_must touch $NISSTAFILE
  fi
  
  cleanup_user_group
  
  # Add root group user
*** 52,59 ****
  log_must add_user $ZFS_ACL_OTHER_GROUP $ZFS_ACL_OTHER1
  log_must add_user $ZFS_ACL_OTHER_GROUP $ZFS_ACL_OTHER2
  
  DISK=${DISKS%% *}
  default_setup_noexit $DISK
! log_must $CHMOD 777 $TESTDIR
  
  log_pass
--- 56,63 ----
  log_must add_user $ZFS_ACL_OTHER_GROUP $ZFS_ACL_OTHER1
  log_must add_user $ZFS_ACL_OTHER_GROUP $ZFS_ACL_OTHER2
  
  DISK=${DISKS%% *}
  default_setup_noexit $DISK
! log_must chmod 777 $TESTDIR
  
  log_pass