From: Marco van Wieringen <mvw@planets.elm.net>
Date: Tue, 21 Jun 2011 08:48:17 +0000 (+0200)
Subject: Fix OSX acl regression test.
X-Git-Tag: Release-7.0.0~893
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e35df1aa10904a1a36dd1748b7059f1d6d4bcd2b;p=bacula%2Fbacula

Fix OSX acl regression test.
---

diff --git a/regress/tests/acl-xattr-test b/regress/tests/acl-xattr-test
index c27e2fd2f1..d7ae46a82e 100755
--- a/regress/tests/acl-xattr-test
+++ b/regress/tests/acl-xattr-test
@@ -118,10 +118,11 @@ case `uname -s` in
       )
       ;;
    Darwin)
-      chmod +a "user:$uid allow read execute" $d/acl-dir
-      chmod +a "user:root allow write execute" $d/acl-dir
-      chmod +a "user:nobody deny read write execute" $d/acl-dir
-      chmod +a "user:nobody deny read write execute" $d/bconsole
+      username=`id -un`
+      chmod +a "user:$username allow read,execute" $d/acl-dir
+      chmod +a "user:root allow write,execute" $d/acl-dir
+      chmod +a "user:nobody deny read,write,execute" $d/acl-dir
+      chmod +a "user:nobody deny read,write,execute" $d/bconsole
       chmod +a "group:nogroup allow execute" $d/bconsole
       cp ${cwd}/bin/bconsole $d/acl-dir
       cp ${cwd}/bin/bconsole $d/other