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/delegate/setup.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/delegate/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   28  #
  29      -# Copyright (c) 2013 by Delphix. All rights reserved.
       29 +# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  30   30  #
  31   31  
  32   32  . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
  33   33  
  34   34  # check svc:/network/nis/client:default state
  35   35  # disable it if the state is ON
  36   36  # and the state will be restored during cleanup.ksh
  37      -log_must $RM -f $NISSTAFILE
  38      -if [[ "ON" == $($SVCS -H -o sta svc:/network/nis/client:default) ]]; then
  39      -        log_must $SVCADM disable -t svc:/network/nis/client:default
  40      -        log_must $TOUCH $NISSTAFILE
       37 +log_must rm -f $NISSTAFILE
       38 +if [[ "ON" == $(svcs -H -o sta svc:/network/nis/client:default) ]]; then
       39 +        log_must svcadm disable -t svc:/network/nis/client:default
       40 +        log_must touch $NISSTAFILE
  41   41  fi
  42   42  
  43   43  cleanup_user_group
  44   44  
  45   45  # Create staff group and add two user to it
  46   46  log_must add_group $STAFF_GROUP
  47   47  log_must add_user $STAFF_GROUP $STAFF1
  48   48  log_must add_user $STAFF_GROUP $STAFF2
  49   49  
  50   50  # Create other group and add two user to it
  51   51  log_must add_group $OTHER_GROUP
  52   52  log_must add_user $OTHER_GROUP $OTHER1
  53   53  log_must add_user $OTHER_GROUP $OTHER2
  54   54  
  55   55  DISK=${DISKS%% *}
  56   56  default_volume_setup $DISK
  57      -log_must $CHMOD 777 $TESTDIR
       57 +log_must chmod 777 $TESTDIR
  58   58  
  59   59  log_pass
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX