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>

*** 24,45 ****
  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/tests/functional/delegate/delegate_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
  
  # Create staff group and add two user to it
--- 24,45 ----
  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/tests/functional/delegate/delegate_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
  
  # Create staff group and add two user to it
*** 52,59 ****
  log_must add_user $OTHER_GROUP $OTHER1
  log_must add_user $OTHER_GROUP $OTHER2
  
  DISK=${DISKS%% *}
  default_volume_setup $DISK
! log_must $CHMOD 777 $TESTDIR
  
  log_pass
--- 52,59 ----
  log_must add_user $OTHER_GROUP $OTHER1
  log_must add_user $OTHER_GROUP $OTHER2
  
  DISK=${DISKS%% *}
  default_volume_setup $DISK
! log_must chmod 777 $TESTDIR
  
  log_pass