testprogs/blackbox: pass $CONFIGURATION to test_samba-tool_ntacl.sh

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 51b5e1ac4f621fcb142d2dba15235ee1bdadd5e1..235d87266fd7830cdb38b275d1c4018142ced19d 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -826,7 +826,7 @@ plantestsuite("samba4.blackbox.client_etypes_all(ad_dc:client)", "ad_dc:client",
 plantestsuite("samba4.blackbox.client_etypes_legacy(ad_dc:client)", "ad_dc:client", [os.path.join(bbdir, "test_client_etypes.sh"), '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD', '$PREFIX_ABS', 'legacy', '23'])
 plantestsuite("samba4.blackbox.client_etypes_strong(ad_dc:client)", "ad_dc:client", [os.path.join(bbdir, "test_client_etypes.sh"), '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD', '$PREFIX_ABS', 'strong', '17_18'])
 plantestsuite("samba4.blackbox.net_ads_dns(ad_member:local)", "ad_member:local", [os.path.join(bbdir, "test_net_ads_dns.sh"), '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD', '$REALM', '$USERNAME', '$PASSWORD'])
-plantestsuite("samba4.blackbox.samba-tool_ntacl(ad_member:local)", "ad_member:local", [os.path.join(bbdir, "test_samba-tool_ntacl.sh"), '$PREFIX', '$DOMSID'])
+plantestsuite("samba4.blackbox.samba-tool_ntacl(ad_member:local)", "ad_member:local", [os.path.join(bbdir, "test_samba-tool_ntacl.sh"), '$PREFIX', '$DOMSID', configuration])
 
 env = "ad_member:local"
 plantestsuite("samba4.blackbox.net_ads_search_server_P.primary", env,

diff --git a/testprogs/blackbox/test_samba-tool_ntacl.sh b/testprogs/blackbox/test_samba-tool_ntacl.sh
index 245897297919964836ea9c4653463a504bac03c4..b6ce4efe4cf03af04bfa38e2772a2e6d99743a22 100755 (executable)
--- a/testprogs/blackbox/test_samba-tool_ntacl.sh
+++ b/testprogs/blackbox/test_samba-tool_ntacl.sh
@@ -2,13 +2,14 @@
 # Blackbox tests for samba-tool ntacl get/set on member server
 # Copyright (C) 2018 Björn Baumbach <bb@sernet.de>
 
-if [ $# -ne 2 ]; then
-       echo "Usage: test_samba-tool_ntacl.sh PREFIX DOMSID"
+if [ $# -ne 3 ]; then
+       echo "Usage: test_samba-tool_ntacl.sh PREFIX DOMSID CONFIGURATION"
        exit 1
 fi
 
 PREFIX=$1
 domain_sid=$2
+CONFIGURATION=$3
 
 failed=0
 
@@ -50,7 +51,7 @@ test_get_acl_ntvfs()
        testfile="$1"
        exptextedacl="$2"
 
-       retacl=$($PYTHON $samba_tool ntacl get "$testfile" --as-sddl --use-ntvfs --xattr-backend=tdb --configfile=$PREFIX/ad_member/lib/server.conf) || return $?
+       retacl=$($PYTHON $samba_tool ntacl get "$testfile" --as-sddl --use-ntvfs --xattr-backend=tdb $CONFIGURATION) || return $?
 
        test "$retacl" = "$exptextedacl"
 }
@@ -60,7 +61,7 @@ test_set_acl_ntvfs()
        testfile="$1"
        acl="$2"
 
-       $PYTHON $samba_tool ntacl set "$acl" "$testfile" --use-ntvfs --xattr-backend=tdb --configfile=$PREFIX/ad_member/lib/server.conf
+       $PYTHON $samba_tool ntacl set "$acl" "$testfile" --use-ntvfs --xattr-backend=tdb $CONFIGURATION
 }
 
 test_changedomsid()
@@ -70,13 +71,13 @@ test_changedomsid()
        $PYTHON $samba_tool ntacl changedomsid \
                "$domain_sid" "$new_domain_sid" "$testfile" \
                --service=tmp \
-               --configfile=$PREFIX/ad_member/lib/server.conf
+               $CONFIGURATION
 
        retacl=$($PYTHON $samba_tool ntacl get \
                "$testfile" \
                --as-sddl \
                --service=tmp \
-               --configfile=$PREFIX/ad_member/lib/server.conf) || return $?
+               $CONFIGURATION) || return $?
 
        test "$retacl" = "$new_acl_without_padding"
 }
@@ -89,14 +90,14 @@ test_changedomsid_ntvfs()
                "$domain_sid" "$new_domain_sid" "$testfile" \
                --use-ntvfs \
                --xattr-backend=tdb \
-               --configfile=$PREFIX/ad_member/lib/server.conf
+               $CONFIGURATION
 
        retacl=$($PYTHON $samba_tool ntacl get \
                "$testfile" \
                --as-sddl \
                --xattr-backend=tdb \
                --use-ntvfs \
-               --configfile=$PREFIX/ad_member/lib/server.conf) || return $?
+               $CONFIGURATION) || return $?
        test "$retacl" = "$new_acl_without_padding"
 }