Print this page
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>

*** 24,47 **** # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ! # Copyright (c) 2013 by Delphix. All rights reserved. # . $STF_SUITE/include/libtest.shlib ZFS_USER=zfsrbac USES_NIS=false # if we're running NIS, turn it off until we clean up # (it can cause useradd to take a long time, hitting our TIMEOUT) ! $SVCS svc:/network/nis/client:default | $GREP online > /dev/null if [ $? -eq 0 ] then ! $SVCADM disable svc:/network/nis/client:default USES_NIS=true fi # create a unique user that we can use to run the tests, --- 24,47 ---- # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ! # Copyright (c) 2013, 2016 by Delphix. All rights reserved. # . $STF_SUITE/include/libtest.shlib ZFS_USER=zfsrbac USES_NIS=false # if we're running NIS, turn it off until we clean up # (it can cause useradd to take a long time, hitting our TIMEOUT) ! svcs svc:/network/nis/client:default | grep online > /dev/null if [ $? -eq 0 ] then ! svcadm disable svc:/network/nis/client:default USES_NIS=true fi # create a unique user that we can use to run the tests,
*** 56,67 **** else FOUND="true" fi done ! log_must $MKDIR -p /export/home/$ZFS_USER ! log_must $USERADD -c "ZFS Privileges Test User" -d /export/home/$ZFS_USER $ZFS_USER echo $ZFS_USER > /tmp/zfs-privs-test-user.txt echo $USES_NIS > /tmp/zfs-privs-test-nis.txt log_pass --- 56,67 ---- else FOUND="true" fi done ! log_must mkdir -p /export/home/$ZFS_USER ! log_must useradd -c "ZFS Privileges Test User" -d /export/home/$ZFS_USER $ZFS_USER echo $ZFS_USER > /tmp/zfs-privs-test-user.txt echo $USES_NIS > /tmp/zfs-privs-test-nis.txt log_pass