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,39 ****
  #
  # 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
  
  cleanup_user_group
  
  # restore the state of svc:/network/nis/client:default
  if [[ -e $NISSTAFILE ]]; then
!     log_must $SVCADM enable svc:/network/nis/client:default
!     log_must $RM -f $NISSTAFILE
  fi
  
  default_cleanup
--- 23,43 ----
  #
  # 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
  
  cleanup_user_group
  
  # restore the state of svc:/network/nis/client:default
  if [[ -e $NISSTAFILE ]]; then
!     log_must svcadm enable svc:/network/nis/client:default
!     log_must rm -f $NISSTAFILE
  fi
  
  default_cleanup