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/privilege/setup.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/privilege/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/include/libtest.shlib
  33   33  
  34   34  ZFS_USER=zfsrbac
  35   35  USES_NIS=false
  36   36  
  37   37  # if we're running NIS, turn it off until we clean up
  38   38  # (it can cause useradd to take a long time, hitting our TIMEOUT)
  39      -$SVCS svc:/network/nis/client:default | $GREP online > /dev/null
       39 +svcs svc:/network/nis/client:default | grep online > /dev/null
  40   40  if [ $? -eq 0 ]
  41   41  then
  42      -  $SVCADM disable svc:/network/nis/client:default
       42 +  svcadm disable svc:/network/nis/client:default
  43   43    USES_NIS=true
  44   44  fi
  45   45  
  46   46  
  47   47  # create a unique user that we can use to run the tests,
  48   48  # making sure not to clobber any existing users.
  49   49  FOUND=""
  50   50  while [ -z "${FOUND}" ]
  51   51  do
  52   52    USER_EXISTS=$( grep $ZFS_USER /etc/passwd )
  53   53    if [ ! -z "${USER_EXISTS}" ]
  54   54    then
  55   55        ZFS_USER="${ZFS_USER}x"
  56   56    else
  57   57        FOUND="true"
  58   58    fi
  59   59  done
  60   60  
  61      -log_must $MKDIR -p /export/home/$ZFS_USER
  62      -log_must $USERADD -c "ZFS Privileges Test User" -d /export/home/$ZFS_USER $ZFS_USER
       61 +log_must mkdir -p /export/home/$ZFS_USER
       62 +log_must useradd -c "ZFS Privileges Test User" -d /export/home/$ZFS_USER $ZFS_USER
  63   63  
  64   64  echo $ZFS_USER > /tmp/zfs-privs-test-user.txt
  65   65  echo $USES_NIS > /tmp/zfs-privs-test-nis.txt
  66   66  
  67   67  log_pass
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX