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>

          --- old/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/setup.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/setup.ksh

   1    1  #!/usr/bin/ksh -p
   2    2  #
   3    3  # CDDL HEADER START
   4    4  #
   5    5  # The contents of this file are subject to the terms of the
   6    6  # Common Development and Distribution License (the "License").
   7    7  # You may not use this file except in compliance with the License.
   8    8  #
   9    9  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10   10  # or http://www.opensolaris.org/os/licensing.
  11   11  # See the License for the specific language governing permissions
  12   12  # and limitations under the License.
  13   13  #
  14   14  # When distributing Covered Code, include this CDDL HEADER in each
  15   15  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16  # If applicable, add the following below this CDDL HEADER, with the
  17   17  # fields enclosed by brackets "[]" replaced with your own identifying

  18   18  # information: Portions Copyright [yyyy] [name of copyright owner]
  19   19  #
  20   20  # CDDL HEADER END
  21   21  #
  22   22  
  23   23  #
  24   24  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  25   25  # Use is subject to license terms.
  26   26  #
  27   27  
       28 +#
       29 +# Copyright (c) 2016 by Delphix. All rights reserved.
       30 +#
       31 +
  28   32  . $STF_SUITE/include/libtest.shlib
  29   33  . $STF_SUITE/tests/functional/acl/acl_common.kshlib
  30   34  
  31   35  # check svc:/network/nis/client:default state
  32   36  # disable it if the state is ON
  33   37  # and the state will be restored during cleanup.ksh
  34      -log_must $RM -f $NISSTAFILE
  35      -if [[ "ON" == $($SVCS -H -o sta svc:/network/nis/client:default) ]]; then
  36      -    log_must $SVCADM disable -t svc:/network/nis/client:default
  37      -    log_must $TOUCH $NISSTAFILE
       38 +log_must rm -f $NISSTAFILE
       39 +if [[ "ON" == $(svcs -H -o sta svc:/network/nis/client:default) ]]; then
       40 +    log_must svcadm disable -t svc:/network/nis/client:default
       41 +    log_must touch $NISSTAFILE
  38   42  fi
  39   43  
  40   44  cleanup_user_group
  41   45  
  42   46  # Add root group user
  43   47  log_must add_user root $ZFS_ACL_ADMIN
  44   48  
  45   49  # Create staff group and add two user to it
  46   50  log_must add_group $ZFS_ACL_STAFF_GROUP
  47   51  log_must add_user $ZFS_ACL_STAFF_GROUP $ZFS_ACL_STAFF1
  48   52  log_must add_user $ZFS_ACL_STAFF_GROUP $ZFS_ACL_STAFF2
  49   53  
  50   54  # Create other group and add two user to it
  51   55  log_must add_group $ZFS_ACL_OTHER_GROUP
  52   56  log_must add_user $ZFS_ACL_OTHER_GROUP $ZFS_ACL_OTHER1
  53   57  log_must add_user $ZFS_ACL_OTHER_GROUP $ZFS_ACL_OTHER2
  54   58  
  55   59  DISK=${DISKS%% *}
  56   60  default_setup_noexit $DISK
  57      -log_must $CHMOD 777 $TESTDIR
       61 +log_must chmod 777 $TESTDIR
  58   62  
  59   63  log_pass
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX