testprogs: Pass configuration to test_kinit_trusts_heimdal.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 3f3e9d97738e5528cc22e37634dbd1b3c4f832aa..43f7f7ea157f72fa48ec3f99abbfff48e1c5c39d 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -626,7 +626,8 @@ if have_heimdal_support:
                       '$TRUST_DOMAIN',
                       '$PREFIX',
                       "forest",
-                      "aes256-cts-hmac-sha1-96"
+                      "aes256-cts-hmac-sha1-96",
+                      configuration
                   ])
     plantestsuite("samba4.blackbox.kinit_trust",
                   "fl2003dc:local",
@@ -644,7 +645,8 @@ if have_heimdal_support:
                       '$TRUST_DOMAIN',
                       '$PREFIX',
                       "external",
-                      "arcfour-hmac-md5"
+                      "arcfour-hmac-md5",
+                      configuration
                   ])
     plantestsuite("samba4.blackbox.kinit_trust",
                   "fl2000dc:local",
@@ -662,7 +664,8 @@ if have_heimdal_support:
                       '$TRUST_DOMAIN',
                       '$PREFIX',
                       "external",
-                      "arcfour-hmac-md5"
+                      "arcfour-hmac-md5",
+                      configuration
                   ])
     plantestsuite("samba4.blackbox.export.keytab",
                   "ad_dc:local",

diff --git a/testprogs/blackbox/test_kinit_trusts_heimdal.sh b/testprogs/blackbox/test_kinit_trusts_heimdal.sh
index f08acc013784a1431c03d5c086be12dd67ffafb3..0816e874aa8087a19a5fe6d95e0de78335c96b95 100755 (executable)
--- a/testprogs/blackbox/test_kinit_trusts_heimdal.sh
+++ b/testprogs/blackbox/test_kinit_trusts_heimdal.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Copyright (C) 2015 Stefan Metzmacher <metze@samba.org>
 
-if [ $# -lt 13 ]; then
+if [ $# -lt 14 ]; then
        cat <<EOF
-Usage: test_kinit_trusts.sh SERVER USERNAME PASSWORD REALM DOMAIN TRUST_USERNAME TRUST_PASSWORD TRUST_REALM TRUST_DOMAIN PREFIX TYPE ENCTYPE
+Usage: test_kinit_trusts.sh SERVER USERNAME PASSWORD REALM DOMAIN TRUST_USERNAME TRUST_PASSWORD TRUST_REALM TRUST_DOMAIN PREFIX TYPE ENCTYPE CONFIGURATION
 EOF
        exit 1
 fi
@@ -23,6 +23,7 @@ shift 5
 PREFIX=$1
 TYPE=$2
 ENCTYPE=$3
+CONFIGURATION="${4}"
 shift 3
 failed=0