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/xattr/setup.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/xattr/setup.ksh

   1    1  #!/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  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  
  26   26  #
  27      -# Copyright (c) 2013 by Delphix. All rights reserved.
       27 +# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  28   28  #
  29   29  
  30   30  . $STF_SUITE/include/libtest.shlib
  31   31  
  32   32  # if we're running NIS, turn it off until we clean up
  33   33  # (it can cause useradd to take a long time, hitting our TIMEOUT)
  34      -USES_NIS=FALSE
  35      -$SVCS svc:/network/nis/client:default | $GREP online > /dev/null
       34 +USES_NIS=false
       35 +svcs svc:/network/nis/client:default | grep online > /dev/null
  36   36  if [ $? -eq 0 ]
  37   37  then
  38      -        $SVCADM disable -t svc:/network/nis/client:default
       38 +        svcadm disable -t svc:/network/nis/client:default
  39   39          USES_NIS=true
  40   40  fi
  41   41  
  42   42  # Make sure we use a brand new user for this
  43   43  ZFS_USER=zxtr
  44   44  ZFS_GROUP=staff
  45   45  while [ -z "${FOUND}" ]
  46   46  do
  47   47          COUNT=0
  48      -        USER_EXISTS=$( $GREP $ZFS_USER /etc/passwd )
       48 +        USER_EXISTS=$( grep $ZFS_USER /etc/passwd )
  49   49          if [ ! -z "${USER_EXISTS}" ]
  50   50          then
  51   51                  ZFS_USER="${ZFS_USER}${COUNT}"
  52   52                  COUNT=$(( $COUNT + 1 ))
  53   53          else
  54   54                  FOUND="true"
  55   55          fi
  56   56  done
  57   57  
  58   58  log_must add_user $ZFS_GROUP $ZFS_USER
  59   59  
  60      -$ECHO $ZFS_USER > /tmp/zfs-xattr-test-user.txt
  61      -$ECHO $USES_NIS > /tmp/zfs-xattr-test-nis.txt
       60 +echo $ZFS_USER > /tmp/zfs-xattr-test-user.txt
       61 +echo $USES_NIS > /tmp/zfs-xattr-test-nis.txt
  62   62  
  63   63  DISK=${DISKS%% *}
  64   64  default_setup $DISK
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX