[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Thu Apr 6 14:48:01 UTC 2023
The branch, master has been updated
via 484bf9c49ae testprogs: Remove unused test_export_keytab_(heimdal|mit).sh
via d9a9cb0396a testprogs: Merge export keytab tests into a single script for MIT and Heimdal
via deb9d1f6565 testprogs: Fix shell arithmetic in test_export_keytab_mit.sh
via 245990998fd testprogs: Reformat test_export_keytab_mit.sh
via e560cf8ae1f testprogs: Fix shell arithmetic in test_export_keytab_heimdal.sh
via 0b21e492c5b testprogs: Reformat test_export_keytab_heimdal.sh
via 51cebd4ba69 testprogs: Remove unused test_kinit_trusts_(heimdal|mit).sh
via f18ca8a5c8b testprogs: Merge kinit trust tests into a single script for MIT and Heimdal
via cbf756bb011 testprogs: Fix shell arithmetic in test_kinit_trusts_heimdal.sh
via 01b1dd8f7b9 testprogs: Fix shell arithmetic in test_kinit_trusts_mit.sh
via ccce9d3fb3c testprogs: Reformat test_kinit_trusts_mit.sh
via 58ca14845c1 testprogs: Reformat test_kinit_trusts_heimdal.sh
via f7402c3400c testprogs: Remove unused test_kinit_(heimdal|mit).sh
via de8a0ee0206 testprogs: Merge kinit tests into a single script for MIT and Heimdal
via 3d63419f927 testprogs: Fix shell arithmetic in test_kinit_mit.sh
via deff466648d testprogs: Reformat test_kinit_mit.sh
via 715f7c46b90 testprogs: Use common binary detection functions in test_kinit_heimdal.sh
via aea8611b393 testprogs: Fix shell arithmetic in test_kinit_heimdal.sh
via c5bf365d923 testprogs: Reformat test_kinit_heimdal.sh
via b6cf609e9fd nsswitch:tests: Use configuration variable passed to test_rfc2307_mapping.sh
via aa2ece8f649 s4:selftest: Move rfc2307_mapping test to ad_dc
via c042b1fba06 s4:selftest: Reformat samba4.blackbox.rfc2307_mapping
via f91f042c1d9 testprogs: Pass configuration to test_kinit_trusts_mit.sh
via 4ea94c8eaac testprogs: Pass configuration to test_kinit_trusts_heimdal.sh
via 3b78011213a testprogs: Remove UID_WRAPPER_ROOT export
via 9e7de6dff6d testprogs: Pass configuration to test_password_settings.sh
via 3af471fe452 s4:selftest: Use ad_dc env for samba4.blackbox.password_settings
via 7ed669ce905 s4:selftest: Reformat samba4.blackbox.password_settings
via 41b4a2a2520 testprogs: Pass configuration to test_kpasswd_mit.sh
via 9e949bc403b testprogs: Pass configuration to test_kpasswd_heimdal.sh
via 62cfab55e6b testprogs: Specify the KRB5CCNAME on the command line
via d2bd1e34091 testprogs: Pass configuration to test_export_keytab_mit.sh
via ff77e910bc2 testprogs: Pass configuration to test_export_keytab_heimdal.sh
via f9441ca26b1 testprogs: Correctly set configuration in test_kinit_heimdal.sh
via 4f228c57f63 testprogs: Correctly set configuration in test_kinit_mit.sh
via 2ad6b6fe2e7 s4:selftest: Use ad_dc environment for kinit tests
via 4fa89f3aeae s4:selftest: Use smbclient3 for kinit tests
via 12d44773b58 s4:tests: Reformat kerberos tests
via 94778b66e03 testprogs: Fix running export.keytab heimdal test
from ca7b7bde391 selftest: Use "debug syslog format = always" in selftest
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 484bf9c49ae91ee57db4dd79cdd7d295faa7a75a
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 09:15:20 2023 +0100
testprogs: Remove unused test_export_keytab_(heimdal|mit).sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Thu Apr 6 14:47:20 UTC 2023 on atb-devel-224
commit d9a9cb0396a819148b5e22154bee07dab1d1c0fa
Author: Andreas Schneider <asn at samba.org>
Date: Wed Mar 15 13:14:16 2023 +0100
testprogs: Merge export keytab tests into a single script for MIT and Heimdal
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit deb9d1f65656057fc0d24a8418592e1c61e612e8
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 09:34:52 2023 +0100
testprogs: Fix shell arithmetic in test_export_keytab_mit.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 245990998fd118a4e5a4ea3a1ac95224a5635e51
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 09:34:29 2023 +0100
testprogs: Reformat test_export_keytab_mit.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit e560cf8ae1f73ac4b098ed8bd4a6ea1f58c9b09b
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 09:26:24 2023 +0100
testprogs: Fix shell arithmetic in test_export_keytab_heimdal.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 0b21e492c5bcf35ee7cfab73009d78fe38cdaec8
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 09:26:07 2023 +0100
testprogs: Reformat test_export_keytab_heimdal.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 51cebd4ba6930e003176b55c87df64bfc80e20c6
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 09:14:18 2023 +0100
testprogs: Remove unused test_kinit_trusts_(heimdal|mit).sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit f18ca8a5c8b80756d47f9a3ac5167bfb31f48978
Author: Andreas Schneider <asn at samba.org>
Date: Wed Mar 15 08:43:54 2023 +0100
testprogs: Merge kinit trust tests into a single script for MIT and Heimdal
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit cbf756bb01186fdae978f63fad9baa53473055da
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 09:12:21 2023 +0100
testprogs: Fix shell arithmetic in test_kinit_trusts_heimdal.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 01b1dd8f7b9cb1606c0bf70c6c62ac35ff4f06b8
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 09:19:28 2023 +0100
testprogs: Fix shell arithmetic in test_kinit_trusts_mit.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit ccce9d3fb3c2769084f6f2a9c36f5c065b5d8af7
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 09:19:07 2023 +0100
testprogs: Reformat test_kinit_trusts_mit.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 58ca14845c1077c556cd45cfaaec463a4e8c6ce0
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 09:11:46 2023 +0100
testprogs: Reformat test_kinit_trusts_heimdal.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit f7402c3400c81bc2114d5d9b1ea037f01360acf7
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 08:50:43 2023 +0100
testprogs: Remove unused test_kinit_(heimdal|mit).sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit de8a0ee020699ec237dd4c8dbb04bf6cbe15a0d4
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 14 10:22:36 2023 +0100
testprogs: Merge kinit tests into a single script for MIT and Heimdal
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 3d63419f927c5c2d999b827ccc49623b82ba5dd9
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 08:40:11 2023 +0100
testprogs: Fix shell arithmetic in test_kinit_mit.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit deff466648d4d0dc5d52a94ea252350380f24864
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 08:39:47 2023 +0100
testprogs: Reformat test_kinit_mit.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 715f7c46b9084ffb003f965dd27e7a6a14b1e3bf
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 08:48:19 2023 +0100
testprogs: Use common binary detection functions in test_kinit_heimdal.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit aea8611b3930f04258c8181e09b274385ce4d34b
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 08:39:19 2023 +0100
testprogs: Fix shell arithmetic in test_kinit_heimdal.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit c5bf365d9230e65a278a297b5e9a8a7a18b8a11d
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 21 08:31:03 2023 +0100
testprogs: Reformat test_kinit_heimdal.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit b6cf609e9fd618eac7af88522fd02709123de2a0
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 13 14:36:58 2023 +0100
nsswitch:tests: Use configuration variable passed to test_rfc2307_mapping.sh
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit aa2ece8f64952707d18d489ca486977f5ef7939b
Author: Andreas Schneider <asn at samba.org>
Date: Thu Mar 16 22:09:34 2023 +0100
s4:selftest: Move rfc2307_mapping test to ad_dc
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit c042b1fba06525dd461203cc357f22d365eab856
Author: Andreas Schneider <asn at samba.org>
Date: Thu Mar 16 22:08:46 2023 +0100
s4:selftest: Reformat samba4.blackbox.rfc2307_mapping
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit f91f042c1d96cfc1e005a12b05a4caf99e37ca73
Author: Andreas Schneider <asn at samba.org>
Date: Wed Mar 15 08:45:15 2023 +0100
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 at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 4ea94c8eaaccd9355fc67086ae44f62a26baabae
Author: Andreas Schneider <asn at samba.org>
Date: Wed Mar 15 08:50:33 2023 +0100
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 at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 3b78011213a7687c6c597e1fd8672552a472c2c0
Author: Andreas Schneider <asn at samba.org>
Date: Wed Mar 22 08:37:15 2023 +0100
testprogs: Remove UID_WRAPPER_ROOT export
This is not needed, we only need it for smbpasswd and in order to get
root we need to set the ruid and euid, which we already do.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 9e7de6dff6d25ca6c144b016ddd12f9ebf0a54e4
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 13 14:32:50 2023 +0100
testprogs: Pass configuration to test_password_settings.sh
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 3af471fe452bbda0b8d12851791d257d7879ab73
Author: Andreas Schneider <asn at samba.org>
Date: Wed Mar 15 21:24:44 2023 +0100
s4:selftest: Use ad_dc env for samba4.blackbox.password_settings
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 7ed669ce90595726f03c7f5b914d29ed7d76eb2e
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 13 14:29:48 2023 +0100
s4:selftest: Reformat samba4.blackbox.password_settings
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 41b4a2a25203e4693e9c74835db0b6bdeca7b129
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 13 12:23:26 2023 +0100
testprogs: Pass configuration to test_kpasswd_mit.sh
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 9e949bc403b92c55c90128fd3917ad1700aaa4c3
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 13 12:23:08 2023 +0100
testprogs: Pass configuration to test_kpasswd_heimdal.sh
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 62cfab55e6b3210238ee049d1768052edf24995c
Author: Andreas Schneider <asn at samba.org>
Date: Wed Mar 15 08:08:45 2023 +0100
testprogs: Specify the KRB5CCNAME on the command line
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit d2bd1e34091b2fb4261578516b38db3dc1971206
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 13 11:56:39 2023 +0100
testprogs: Pass configuration to test_export_keytab_mit.sh
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit ff77e910bc2c2dc34882402c732e8d57dde6d422
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 13 11:50:47 2023 +0100
testprogs: Pass configuration to test_export_keytab_heimdal.sh
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit f9441ca26b17b149ec3f714a162d1811d9cc241a
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 13 11:40:32 2023 +0100
testprogs: Correctly set configuration in test_kinit_heimdal.sh
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 4f228c57f634885f23055a717b69b58a50415267
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 13 10:47:15 2023 +0100
testprogs: Correctly set configuration in test_kinit_mit.sh
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 2ad6b6fe2e7a0bb0b14dd7d58ad890b3fef5250a
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 14 08:08:22 2023 +0100
s4:selftest: Use ad_dc environment for kinit tests
This makes sure they are run as part of "samba-addc-mit-1".
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 4fa89f3aeaedf4de09e2e6c629eb3f738ad77ed0
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 14 08:06:35 2023 +0100
s4:selftest: Use smbclient3 for kinit tests
smbclient3 has support for SMB2+.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 12d44773b5826b61724a067b529067e247b989b1
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 13 11:38:02 2023 +0100
s4:tests: Reformat kerberos tests
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 94778b66e037f82d102de374414c17264425a1d2
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 20 10:37:01 2023 +0100
testprogs: Fix running export.keytab heimdal test
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
nsswitch/tests/test_rfc2307_mapping.sh | 17 +-
source4/selftest/tests.py | 194 +++++++-
testprogs/blackbox/test_export_keytab_heimdal.sh | 120 -----
testprogs/blackbox/test_export_keytab_mit.sh | 137 ------
testprogs/blackbox/test_kinit.sh | 555 +++++++++++++++++++++++
testprogs/blackbox/test_kinit_export_keytab.sh | 263 +++++++++++
testprogs/blackbox/test_kinit_heimdal.sh | 255 -----------
testprogs/blackbox/test_kinit_mit.sh | 328 --------------
testprogs/blackbox/test_kinit_trusts.sh | 247 ++++++++++
testprogs/blackbox/test_kinit_trusts_heimdal.sh | 103 -----
testprogs/blackbox/test_kinit_trusts_mit.sh | 140 ------
testprogs/blackbox/test_kpasswd_heimdal.sh | 24 +-
testprogs/blackbox/test_kpasswd_mit.sh | 24 +-
testprogs/blackbox/test_password_settings.sh | 55 ++-
14 files changed, 1299 insertions(+), 1163 deletions(-)
delete mode 100755 testprogs/blackbox/test_export_keytab_heimdal.sh
delete mode 100755 testprogs/blackbox/test_export_keytab_mit.sh
create mode 100755 testprogs/blackbox/test_kinit.sh
create mode 100755 testprogs/blackbox/test_kinit_export_keytab.sh
delete mode 100755 testprogs/blackbox/test_kinit_heimdal.sh
delete mode 100755 testprogs/blackbox/test_kinit_mit.sh
create mode 100755 testprogs/blackbox/test_kinit_trusts.sh
delete mode 100755 testprogs/blackbox/test_kinit_trusts_heimdal.sh
delete mode 100755 testprogs/blackbox/test_kinit_trusts_mit.sh
Changeset truncated at 500 lines:
diff --git a/nsswitch/tests/test_rfc2307_mapping.sh b/nsswitch/tests/test_rfc2307_mapping.sh
index 66ee865f8eb..a700791bde3 100755
--- a/nsswitch/tests/test_rfc2307_mapping.sh
+++ b/nsswitch/tests/test_rfc2307_mapping.sh
@@ -1,8 +1,8 @@
#!/bin/sh
# Blackbox test for wbinfo and rfc2307 mappings
-if [ $# -lt 4 ]; then
+if [ $# -lt 7 ]; then
cat <<EOF
-Usage: test_rfc2307_mapping.sh DOMAIN USERNAME PASSWORD SERVER UID_RFC2307TEST GID_RFC2307TEST
+Usage: test_rfc2307_mapping.sh DOMAIN USERNAME PASSWORD SERVER UID_RFC2307TEST GID_RFC2307TEST CONFIGURATION
EOF
exit 1
fi
@@ -13,6 +13,7 @@ PASSWORD=$3
SERVER=$4
UID_RFC2307TEST=$5
GID_RFC2307TEST=$6
+CONFIGURATION=${7}
shift 6
failed=0
@@ -61,11 +62,13 @@ knownfail()
# Create new testing account
testit "user add" $PYTHON $samba_tool user create --given-name="rfc2307" \
- --surname="Tester" --initial="UT" rfc2307_test_user testp at ssw0Rd "$@"
+ --surname="Tester" --initial="UT" rfc2307_test_user testp at ssw0Rd \
+ "${CONFIGURATION}" "$@"
#test creation of six different groups
-testit "group add" $PYTHON $samba_tool group add $CONFIG \
- --group-scope='Domain' --group-type='Security' rfc2307_test_group "$@"
+testit "group add" $PYTHON $samba_tool group add \
+ --group-scope='Domain' --group-type='Security' rfc2307_test_group \
+ "${CONFIGURATION}" "$@"
# Create new testing group
@@ -184,7 +187,7 @@ else
echo "success: wbinfo -Y check for sane mapping"
fi
-testit "group delete" $PYTHON $samba_tool group delete rfc2307_test_group "$@"
-testit "user delete" $PYTHON $samba_tool user delete rfc2307_test_user "$@"
+testit "group delete" $PYTHON $samba_tool group delete rfc2307_test_group "${CONFIGURATION}" "$@"
+testit "user delete" $PYTHON $samba_tool user delete rfc2307_test_user "${CONFIGURATION}" "$@"
exit $failed
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index f9e37610bdc..7860e150d26 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -568,24 +568,157 @@ plantestsuite("samba4.blackbox.test_primary_group", "ad_dc:local", [os.path.join
plantestsuite("samba4.blackbox.test_old_enctypes", "fl2003dc:local", [os.path.join(bbdir, "test_old_enctypes.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$NETBIOSNAME', '$PREFIX_ABS'])
if have_heimdal_support:
- plantestsuite("samba4.blackbox.kinit", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_kinit_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", smbclient4, configuration])
- plantestsuite("samba4.blackbox.kinit", "fl2000dc:local", [os.path.join(bbdir, "test_kinit_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "arcfour-hmac-md5", smbclient3, configuration])
- plantestsuite("samba4.blackbox.kinit", "fl2008r2dc:local", [os.path.join(bbdir, "test_kinit_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", smbclient3, configuration])
- plantestsuite("samba4.blackbox.kinit_trust", "fl2008r2dc:local", [os.path.join(bbdir, "test_kinit_trusts_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "forest", "aes256-cts-hmac-sha1-96"])
- plantestsuite("samba4.blackbox.kinit_trust", "fl2003dc:local", [os.path.join(bbdir, "test_kinit_trusts_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "external", "arcfour-hmac-md5"])
- plantestsuite("samba4.blackbox.kinit_trust", "fl2000dc:local", [os.path.join(bbdir, "test_kinit_trusts_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "external", "arcfour-hmac-md5"])
- plantestsuite("samba4.blackbox.export.keytab", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_export_keytab_heimdal.sh"), '$SERVER', '$USERNAME', '$REALM', '$DOMAIN', "$PREFIX", smbclient4])
- plantestsuite("samba4.blackbox.kpasswd", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_kpasswd_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', "$PREFIX/ad_dc_ntvfs"])
- plantestsuite("samba4.blackbox.krb5.s4u", "fl2008r2dc:local", [os.path.join(bbdir, "test_s4u_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', configuration])
+ plantestsuite("samba4.blackbox.kpasswd",
+ "ad_dc:local",
+ [
+ os.path.join(bbdir, "test_kpasswd_heimdal.sh"),
+ '$SERVER',
+ '$USERNAME',
+ '$PASSWORD',
+ '$REALM',
+ '$DOMAIN',
+ "$PREFIX",
+ configuration
+ ])
+ plantestsuite("samba4.blackbox.krb5.s4u",
+ "fl2008r2dc:local",
+ [
+ os.path.join(bbdir, "test_s4u_heimdal.sh"),
+ '$SERVER',
+ '$USERNAME',
+ '$PASSWORD',
+ '$REALM',
+ '$DOMAIN',
+ '$TRUST_SERVER',
+ '$TRUST_USERNAME',
+ '$TRUST_PASSWORD',
+ '$TRUST_REALM',
+ '$TRUST_DOMAIN',
+ '$PREFIX',
+ configuration
+ ])
else:
- plantestsuite("samba4.blackbox.kinit", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_kinit_mit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', smbclient4, configuration])
- plantestsuite("samba4.blackbox.kinit", "fl2000dc:local", [os.path.join(bbdir, "test_kinit_mit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', smbclient3, configuration])
- plantestsuite("samba4.blackbox.kinit", "fl2008r2dc:local", [os.path.join(bbdir, "test_kinit_mit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', smbclient3, configuration])
- plantestsuite("samba4.blackbox.kinit_trust", "fl2008r2dc:local", [os.path.join(bbdir, "test_kinit_trusts_mit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "forest"])
- plantestsuite("samba4.blackbox.kinit_trust", "fl2003dc:local", [os.path.join(bbdir, "test_kinit_trusts_mit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "external"])
- plantestsuite("samba4.blackbox.kinit_trust", "fl2000dc:local", [os.path.join(bbdir, "test_kinit_trusts_mit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "external"])
- plantestsuite("samba4.blackbox.export.keytab", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_export_keytab_mit.sh"), '$SERVER', '$USERNAME', '$REALM', '$DOMAIN', "$PREFIX", smbclient4])
- plantestsuite("samba4.blackbox.kpasswd", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_kpasswd_mit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', "$PREFIX/ad_dc_ntvfs"])
+ plantestsuite("samba4.blackbox.kpasswd",
+ "ad_dc:local",
+ [
+ os.path.join(bbdir, "test_kpasswd_mit.sh"),
+ '$SERVER',
+ '$USERNAME',
+ '$PASSWORD',
+ '$REALM',
+ '$DOMAIN',
+ "$PREFIX",
+ configuration
+ ])
+
+plantestsuite("samba4.blackbox.kinit_simple",
+ "ad_dc:local",
+ [
+ os.path.join(bbdir, "test_kinit.sh"),
+ '$SERVER',
+ '$USERNAME',
+ '$PASSWORD',
+ '$REALM',
+ '$DOMAIN',
+ '$PREFIX',
+ smbclient3,
+ configuration
+ ])
+plantestsuite("samba4.blackbox.kinit_simple",
+ "fl2000dc:local",
+ [
+ os.path.join(bbdir, "test_kinit.sh"),
+ '$SERVER',
+ '$USERNAME',
+ '$PASSWORD',
+ '$REALM',
+ '$DOMAIN',
+ '$PREFIX',
+ smbclient3,
+ configuration
+ ])
+plantestsuite("samba4.blackbox.kinit_simple",
+ "fl2008r2dc:local",
+ [
+ os.path.join(bbdir, "test_kinit.sh"),
+ '$SERVER',
+ '$USERNAME',
+ '$PASSWORD',
+ '$REALM',
+ '$DOMAIN',
+ '$PREFIX',
+ smbclient3,
+ configuration
+ ])
+
+
+plantestsuite("samba4.blackbox.kinit_trust",
+ "fl2008r2dc:local",
+ [
+ os.path.join(bbdir, "test_kinit_trusts.sh"),
+ '$SERVER',
+ '$USERNAME',
+ '$PASSWORD',
+ '$REALM',
+ '$DOMAIN',
+ '$TRUST_SERVER',
+ '$TRUST_USERNAME',
+ '$TRUST_PASSWORD',
+ '$TRUST_REALM',
+ '$TRUST_DOMAIN',
+ '$PREFIX',
+ "forest",
+ configuration
+ ])
+plantestsuite("samba4.blackbox.kinit_trust",
+ "fl2003dc:local",
+ [
+ os.path.join(bbdir, "test_kinit_trusts.sh"),
+ '$SERVER',
+ '$USERNAME',
+ '$PASSWORD',
+ '$REALM',
+ '$DOMAIN',
+ '$TRUST_SERVER',
+ '$TRUST_USERNAME',
+ '$TRUST_PASSWORD',
+ '$TRUST_REALM',
+ '$TRUST_DOMAIN',
+ '$PREFIX',
+ "external",
+ configuration
+ ])
+plantestsuite("samba4.blackbox.kinit_trust",
+ "fl2000dc:local",
+ [
+ os.path.join(bbdir, "test_kinit_trusts.sh"),
+ '$SERVER',
+ '$USERNAME',
+ '$PASSWORD',
+ '$REALM',
+ '$DOMAIN',
+ '$TRUST_SERVER',
+ '$TRUST_USERNAME',
+ '$TRUST_PASSWORD',
+ '$TRUST_REALM',
+ '$TRUST_DOMAIN',
+ '$PREFIX',
+ "external",
+ configuration
+ ])
+
+plantestsuite("samba4.blackbox.kinit.export.keytab",
+ "ad_dc:local",
+ [
+ os.path.join(bbdir, "test_kinit_export_keytab.sh"),
+ '$SERVER',
+ '$USERNAME',
+ '$REALM',
+ '$DOMAIN',
+ "$PREFIX",
+ smbclient3,
+ configuration
+ ])
plantestsuite("samba4.blackbox.pkinit_simple",
"ad_dc:local",
@@ -651,14 +784,37 @@ plantestsuite("samba4.blackbox.trust_token", "fl2008r2dc", [os.path.join(bbdir,
plantestsuite("samba4.blackbox.trust_token", "fl2003dc", [os.path.join(bbdir, "test_trust_token.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$DOMSID', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$TRUST_DOMSID', 'external'])
plantestsuite("samba4.blackbox.trust_token", "fl2000dc", [os.path.join(bbdir, "test_trust_token.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$DOMSID', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$TRUST_DOMSID', 'external'])
plantestsuite("samba4.blackbox.ktpass(ad_dc_ntvfs)", "ad_dc_ntvfs", [os.path.join(bbdir, "test_ktpass.sh"), '$PREFIX/ad_dc_ntvfs'])
-plantestsuite("samba4.blackbox.password_settings(ad_dc_ntvfs:local)", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_password_settings.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', "$PREFIX/ad_dc_ntvfs"])
+plantestsuite("samba4.blackbox.password_settings",
+ "ad_dc:local",
+ [
+ os.path.join(bbdir, "test_password_settings.sh"),
+ '$SERVER',
+ '$USERNAME',
+ '$PASSWORD',
+ '$REALM',
+ '$DOMAIN',
+ "$PREFIX",
+ configuration
+ ])
plantestsuite("samba4.blackbox.trust_user_account", "fl2008r2dc:local", [os.path.join(bbdir, "test_trust_user_account.sh"), '$PREFIX', '$REALM', '$DOMAIN', '$TRUST_REALM', '$TRUST_DOMAIN'])
plantestsuite("samba4.blackbox.cifsdd(ad_dc_ntvfs)", "ad_dc_ntvfs", [os.path.join(samba4srcdir, "client/tests/test_cifsdd.sh"), '$SERVER', '$USERNAME', '$PASSWORD', "$DOMAIN"])
plantestsuite("samba4.blackbox.nmblookup(ad_dc_ntvfs)", "ad_dc_ntvfs", [os.path.join(samba4srcdir, "utils/tests/test_nmblookup.sh"), '$NETBIOSNAME', '$NETBIOSALIAS', '$SERVER', '$SERVER_IP', nmblookup4])
plantestsuite("samba4.blackbox.locktest(ad_dc_ntvfs)", "ad_dc_ntvfs", [os.path.join(samba4srcdir, "torture/tests/test_locktest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', '$PREFIX'])
plantestsuite("samba4.blackbox.masktest", "ad_dc_ntvfs", [os.path.join(samba4srcdir, "torture/tests/test_masktest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', '$PREFIX'])
plantestsuite("samba4.blackbox.gentest(ad_dc_ntvfs)", "ad_dc_ntvfs", [os.path.join(samba4srcdir, "torture/tests/test_gentest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', "$PREFIX"])
-plantestsuite("samba4.blackbox.rfc2307_mapping(ad_dc_ntvfs:local)", "ad_dc_ntvfs:local", [os.path.join(samba4srcdir, "../nsswitch/tests/test_rfc2307_mapping.sh"), '$DOMAIN', '$USERNAME', '$PASSWORD', "$SERVER", "$UID_RFC2307TEST", "$GID_RFC2307TEST", configuration])
+plantestsuite("samba4.blackbox.rfc2307_mapping",
+ "ad_dc:local",
+ [
+ os.path.join(samba4srcdir,
+ "../nsswitch/tests/test_rfc2307_mapping.sh"),
+ '$DOMAIN',
+ '$USERNAME',
+ '$PASSWORD',
+ "$SERVER",
+ "$UID_RFC2307TEST",
+ "$GID_RFC2307TEST",
+ configuration
+ ])
plantestsuite("samba4.blackbox.chgdcpass", "chgdcpass", [os.path.join(bbdir, "test_chgdcpass.sh"), '$SERVER', r"CHGDCPASS\$", '$REALM', '$DOMAIN', '$PREFIX/chgdcpass', "aes256-cts-hmac-sha1-96", '$PREFIX/chgdcpass', smbclient3])
plantestsuite("samba4.blackbox.samba_upgradedns(chgdcpass:local)", "chgdcpass:local", [os.path.join(bbdir, "test_samba_upgradedns.sh"), '$SERVER', '$REALM', '$PREFIX', '$SELFTEST_PREFIX/chgdcpass'])
plantestsuite("samba4.blackbox.net_ads", "ad_dc:client", [os.path.join(bbdir, "test_net_ads.sh"), '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD', '$PREFIX_ABS'])
diff --git a/testprogs/blackbox/test_export_keytab_heimdal.sh b/testprogs/blackbox/test_export_keytab_heimdal.sh
deleted file mode 100755
index 156c714b519..00000000000
--- a/testprogs/blackbox/test_export_keytab_heimdal.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-# Blackbox tests for kinit and kerberos integration with smbclient etc
-# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
-# Copyright (C) 2006-2008 Andrew Bartlett <abartlet at samba.org>
-
-if [ $# -lt 5 ]; then
- cat <<EOF
-Usage: test_extract_keytab.sh SERVER USERNAME REALM DOMAIN PREFIX SMBCLIENT
-EOF
- exit 1
-fi
-
-SERVER=$1
-USERNAME=$2
-REALM=$3
-DOMAIN=$4
-PREFIX=$5
-smbclient=$6
-shift 6
-failed=0
-
-samba4bindir="$BINDIR"
-samba_tool="$samba4bindir/samba-tool"
-samba4ktutil="$BINDIR/samba4ktutil"
-newuser="$samba_tool user create"
-
-DNSDOMAIN=$(echo $REALM | tr '[:upper:]' '[:lower:]')
-SERVER_FQDN="$SERVER.$DNSDOMAIN"
-
-samba4kinit_binary=kinit
-if test -x $BINDIR/samba4kinit; then
- samba4kinit_binary=$BINDIR/samba4kinit
-fi
-
-. $(dirname $0)/subunit.sh
-. $(dirname $0)/common_test_fns.inc
-
-test_keytab()
-{
- testname="$1"
- keytab="$2"
- principal="$3"
- expected_nkeys="$4"
-
- echo "test: $testname"
-
- NKEYS=$($VALGRIND $samba4ktutil $keytab | grep -i "$principal" | egrep -c "aes|arcfour")
- status=$?
- if [ x$status != x0 ]; then
- echo "failure: $testname"
- return $status
- fi
-
- if [ x$NKEYS != x$expected_nkeys ]; then
- echo "failure: $testname"
- return 1
- fi
- echo "success: $testname"
- return 0
-}
-
-TEST_USER="$(mktemp -u keytabtestuserXXXXXX)"
-USERPASS=testPaSS at 01%
-unc="//$SERVER/tmp"
-
-testit "create user locally" $VALGRIND $PYTHON $newuser ${TEST_USER} $USERPASS "$@" || failed=$(expr $failed + 1)
-
-testit "dump keytab from domain" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab "$@" || failed=$(expr $failed + 1)
-test_keytab "read keytab from domain" "$PREFIX/tmpkeytab" "$SERVER\\\$" 3
-testit "dump keytab from domain (2nd time)" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab "$@" || failed=$(expr $failed + 1)
-test_keytab "read keytab from domain (2nd time)" "$PREFIX/tmpkeytab" "$SERVER\\\$" 3
-
-testit "dump keytab from domain for cifs principal" $VALGRIND $PYTHON
-$samba_tool domain exportkeytab $PREFIX/tmpkeytab-server --principal=cifs/$SERVER_FQDN "$@" || failed=$(expr $failed + 1)
-test_keytab "read keytab from domain for cifs principal" "$PREFIX/tmpkeytab-server" "cifs/$SERVER_FQDN" 3
-testit "dump keytab from domain for cifs principal (2nd time)" $VALGRIND $PYTHON
-$samba_tool domain exportkeytab $PREFIX/tmpkeytab-server --principal=cifs/$SERVER_FQDN "$@" || failed=$(expr $failed + 1)
-test_keytab "read keytab from domain for cifs principal (2nd time)" "$PREFIX/tmpkeytab-server" "cifs/$SERVER_FQDN" 3
-
-testit "dump keytab from domain for user principal" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-2 --principal=${TEST_USER} "$@" || failed=$(expr $failed + 1)
-test_keytab "dump keytab from domain for user principal" "$PREFIX/tmpkeytab-2" "${TEST_USER}@$REALM" 3
-testit "dump keytab from domain for user principal (2nd time)" $VALGRIND $PYTHON
-$samba_tool domain exportkeytab $PREFIX/tmpkeytab-2 --principal=${TEST_USER}@$REALM "$@" || failed=$(expr $failed + 1)
-test_keytab "dump keytab from domain for user principal (2nd time)" "$PREFIX/tmpkeytab-2" "${TEST_USER}@$REALM" 3
-
-testit "dump keytab from domain for user principal with SPN as UPN" $VALGRIND
-$PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-3 --principal=http/testupnspn.$DNSDOMAIN "$@" || failed=$(expr $failed + 1)
-test_keytab "dump keytab from domain for user principal" "$PREFIX/tmpkeytab-3" "http/testupnspn.$DNSDOMAIN@$REALM" 3
-
-KRB5CCNAME="$PREFIX/tmpuserccache"
-samba4kinit="$samba4kinit_binary -c $KRB5CCNAME"
-export KRB5CCNAME
-
-testit "kinit with keytab as user" $VALGRIND $samba4kinit --keytab=$PREFIX/tmpkeytab --request-pac ${TEST_USER}@$REALM || failed=$(expr $failed + 1)
-
-test_smbclient "Test login with user kerberos ccache" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$(expr $failed + 1)
-
-testit "kinit with keytab as user (2)" $VALGRIND $samba4kinit --keytab=$PREFIX/tmpkeytab-2 --request-pac ${TEST_USER}@$REALM || failed=$(expr $failed + 1)
-
-test_smbclient "Test login with user kerberos ccache as user (2)" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$(expr $failed + 1)
-
-KRB5CCNAME="$PREFIX/tmpadminccache"
-samba4kinit="$samba4kinit_binary -c $KRB5CCNAME"
-export KRB5CCNAME
-
-testit "kinit with keytab as $USERNAME" $VALGRIND $samba4kinit --keytab=$PREFIX/tmpkeytab --request-pac $USERNAME@$REALM || failed=$(expr $failed + 1)
-
-KRB5CCNAME="$PREFIX/tmpspnupnccache"
-samba4kinit="$samba4kinit_binary -c $KRB5CCNAME"
-export KRB5CCNAME
-testit "kinit with SPN from keytab" $VALGRIND $samba4kinit -k -t $PREFIX/tmpkeytab-3 http/testupnspn.$DNSDOMAIN || failed=$(expr $failed + 1)
-
-KRB5CCNAME="$PREFIX/tmpadminccache"
-samba4kinit="$samba4kinit_binary -c $KRB5CCNAME"
-export KRB5CCNAME
-
-testit "del user" $VALGRIND $PYTHON $samba_tool user delete ${TEST_USER} -k yes "$@" || failed=$(expr $failed + 1)
-
-rm -f $PREFIX/tmpadminccache $PREFIX/tmpuserccache $PREFIX/tmpkeytab $PREFIX/tmpkeytab-2 $PREFIX/tmpkeytab-2 $PREFIX/tmpkeytab-server $PREFIX/tmpspnupnccache
-exit $failed
diff --git a/testprogs/blackbox/test_export_keytab_mit.sh b/testprogs/blackbox/test_export_keytab_mit.sh
deleted file mode 100755
index 541f800ed5c..00000000000
--- a/testprogs/blackbox/test_export_keytab_mit.sh
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/sh
-#
-# Blackbox tests for an exported keytab with kinit
-#
-# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
-# Copyright (C) 2006-2008 Andrew Bartlett <abartlet at samba.org>
-# Copyright (C) 2016 Andreas Schneider <asn at cryptomilk.org>
-
-if [ $# -lt 5 ]; then
- cat <<EOF
-Usage: test_extract_keytab.sh SERVER USERNAME REALM DOMAIN PREFIX SMBCLIENT
-EOF
- exit 1
-fi
-
-SERVER=$1
-USERNAME=$2
-REALM=$3
-DOMAIN=$4
-PREFIX=$5
-smbclient=$6
-shift 6
-failed=0
-
-samba_bindir="$BINDIR"
-samba_tool="$samba_bindir/samba-tool"
-samba_newuser="$samba_tool user create"
-samba_texpect="$samba_bindir/texpect"
-samba_ktutil="$BINDIR/samba4ktutil"
-
-samba_kinit=kinit
-samba_kdestroy=kdestroy
-
-SERVER_FQDN="$SERVER.$(echo $REALM | tr '[:upper:]' '[:lower:]')"
-
-source $(dirname $0)/subunit.sh
-
-test_smbclient()
-{
- name="$1"
- cmd="$2"
- shift
- shift
- echo "test: $name"
- $VALGRIND $smbclient //$SERVER/tmp -c "$cmd" "$@"
- status=$?
- if [ x$status = x0 ]; then
- echo "success: $name"
- else
- echo "failure: $name"
- fi
- return $status
-}
-
-test_keytab()
-{
- testname="$1"
- keytab="$2"
- principal="$3"
- expected_nkeys="$4"
-
- echo "test: $testname"
-
- NKEYS=$($VALGRIND $samba_ktutil $keytab | grep -i "$principal" | egrep -c "DES|AES|ArcFour")
- status=$?
- if [ x$status != x0 ]; then
- echo "failure: $testname"
- return $status
- fi
-
- if [ x$NKEYS != x$expected_nkeys ]; then
- echo "failure: $testname"
- return 1
- fi
- echo "success: $testname"
- return 0
-}
-
-TEST_USER="$(mktemp -u keytabtestuserXXXXXX)"
-TEST_PASSWORD=testPaSS at 01%
-
-EXPECTED_NKEYS=3
-krb5_version="$(krb5-config --version | cut -d ' ' -f 4)"
-krb5_major_version="$(echo $krb5_version | awk -F. '{ print $1; }')"
-krb5_minor_version="$(echo $krb5_version | awk -F. '{ print $2; }')"
-
-# MIT Kerberos < 1.18 has support for DES keys
-if [ $krb5_major_version -eq 1 ] && [ $krb5_minor_version -lt 18 ]; then
- EXPECTED_NKEYS=5
-fi
-
-testit "create local user $TEST_USER" $VALGRIND $PYTHON $samba_newuser $TEST_USER $TEST_PASSWORD "$@" || failed=$(expr $failed + 1)
-
-testit "dump keytab from domain" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-all "$@" || failed=$(expr $failed + 1)
-test_keytab "read keytab from domain" "$PREFIX/tmpkeytab-all" "$SERVER\\\$" $EXPECTED_NKEYS
-
-testit "dump keytab from domain (2nd time)" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-all "$@" || failed=$(expr $failed + 1)
-test_keytab "read keytab from domain (2nd time)" "$PREFIX/tmpkeytab-all" "$SERVER\\\$" $EXPECTED_NKEYS
-
--
Samba Shared Repository
More information about the samba-cvs
mailing list