testprogs: Pass configuration to test_kinit_trusts_mit.sh

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 43f7f7ea157f72fa48ec3f99abbfff48e1c5c39d..fa61cdd9e3e63cbbee7118238985ac6e8ba6876c 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -763,7 +763,8 @@ else:
                       '$TRUST_REALM',
                       '$TRUST_DOMAIN',
                       '$PREFIX',
-                      "forest"
+                      "forest",
+                      configuration
                   ])
     plantestsuite("samba4.blackbox.kinit_trust",
                   "fl2003dc:local",
@@ -780,7 +781,8 @@ else:
                       '$TRUST_REALM',
                       '$TRUST_DOMAIN',
                       '$PREFIX',
-                      "external"
+                      "external",
+                      configuration
                   ])
     plantestsuite("samba4.blackbox.kinit_trust",
                   "fl2000dc:local",
@@ -797,7 +799,8 @@ else:
                       '$TRUST_REALM',
                       '$TRUST_DOMAIN',
                       '$PREFIX',
-                      "external"
+                      "external",
+                      configuration
                   ])
     plantestsuite("samba4.blackbox.export.keytab",
                   "ad_dc:local",

diff --git a/testprogs/blackbox/test_kinit_trusts_mit.sh b/testprogs/blackbox/test_kinit_trusts_mit.sh
index 27ed89861cb40be7ee3b83cd7387d8c4138a19f2..415d64a53827c1ed072149e0402a114f4f355176 100755 (executable)
--- a/testprogs/blackbox/test_kinit_trusts_mit.sh
+++ b/testprogs/blackbox/test_kinit_trusts_mit.sh
@@ -3,9 +3,9 @@
 # Copyright (c) 2015 Stefan Metzmacher <metze@samba.org>
 # Copyright (c) 2016 Andreas Schneider <asn@samba.org>
 
-if [ $# -lt 5 ]; then
+if [ $# -lt 13 ]; then
        cat <<EOF
-Usage: test_kinit_trusts.sh SERVER USERNAME PASSWORD REALM DOMAIN TRUST_USERNAME TRUST_PASSWORD TRUST_REALM TRUST_DOMAIN PREFIX TYPE
+Usage: test_kinit_trusts.sh SERVER USERNAME PASSWORD REALM DOMAIN TRUST_USERNAME TRUST_PASSWORD TRUST_REALM TRUST_DOMAIN PREFIX TYPE CONFIGURATION
 EOF
        exit 1
 fi
@@ -24,7 +24,8 @@ TRUST_DOMAIN=$5
 shift 5
 PREFIX=$1
 TYPE=$2
-shift 2
+CONFIGURATION="${3}"
+shift 3
 
 failed=0