From 90d51ffd5436ccdea916c9e6c4c452fe832bf274 Mon Sep 17 00:00:00 2001
From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sun, 27 Sep 2009 17:27:22 +0200
Subject: [PATCH] Make sure we use the right chmod for Solaris

---
 regress/tests/acl-xattr-test | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/regress/tests/acl-xattr-test b/regress/tests/acl-xattr-test
index 991fdc9ad4..3a28ab2a2a 100755
--- a/regress/tests/acl-xattr-test
+++ b/regress/tests/acl-xattr-test
@@ -101,24 +101,25 @@ case `uname -s` in
       #
       df -F zfs $d > /dev/null 2>&1
       if [ $? = 0 ]; then
-         chmod A+user:$uid:rx:allow $d/acl-dir
-         chmod A+user:root:wx:allow $d/acl-dir
-         chmod A+user:nobody:rwx:deny $d/acl-dir
-         chmod A+user:nobody:rwx:deny $d/bconsole
-         chmod A+group:nogroup:x:allow $d/bconsole
+         /bin/chmod A+user:$uid:rx:allow $d/acl-dir
+         /bin/chmod A+user:root:wx:allow $d/acl-dir
+         /bin/chmod A+user:nobody:rwx:deny $d/acl-dir
+         /bin/chmod A+user:nobody:rwx:deny $d/bconsole
+         /bin/chmod A+group:nogroup:x:allow $d/bconsole
       else
-         chmod A+user:$uid:r-x $d/acl-dir
-         chmod A+user:root:-wx $d/acl-dir
-         chmod A+user:nobody:--- $d/acl-dir
-         chmod A+user:nobody:--- $d/bconsole
-         chmod A+group:nogroup:--x $d/bconsole
+         /bin/chmod A+user:$uid:r-x $d/acl-dir
+         /bin/chmod A+user:root:-wx $d/acl-dir
+         /bin/chmod A+user:nobody:--- $d/acl-dir
+         /bin/chmod A+user:nobody:--- $d/bconsole
+         /bin/chmod A+group:nogroup:--x $d/bconsole
       fi
-      runat $d/other 'cat > bacula.test' << EOF
+      cp ${cwd}/bin/bconsole $d/other
+      /bin/runat $d/other 'cat > bacula.test' << EOF
 rulez
 EOF
       ( cd $cwd/build
-        ls -ldv -R acl > $cwd/tmp/org
-        runat $d/other 'cat bacula.test' > $cwd/tmp/attr.org
+        /bin/ls -ldv -R acl > $cwd/tmp/org
+        /bin/runat $d/other 'cat bacula.test' > $cwd/tmp/attr.org
       )
       ;;
 esac
@@ -167,8 +168,8 @@ case `uname -s` in
       ;;
    SunOS)
       ( cd $cwd/tmp/bacula-restores/$cwd/build
-        ls -ldv -R acl > $cwd/tmp/new
-        runat $d/other 'cat bacula.test' > $cwd/tmp/attr.new
+        /bin/ls -ldv -R acl > $cwd/tmp/new
+        /bin/runat $d/other 'cat bacula.test' > $cwd/tmp/attr.new
       )
       ;;
 esac
-- 
2.39.5