diff options
| author | Stefan Metzmacher <metze@samba.org> | 2023-04-05 16:45:21 +0200 |
|---|---|---|
| committer | Jule Anger <janger@samba.org> | 2023-04-14 12:27:15 +0000 |
| commit | 45a264bf5b6cd8116ed9c45086163d33da9ea7a4 (patch) | |
| tree | 6d0e675f16b293cff50f83ba71eb8b074fee3fcd | |
| parent | d8fa74a176ef6078075865479157b5560d0f66cf (diff) | |
| download | samba-45a264bf5b6cd8116ed9c45086163d33da9ea7a4.tar.gz | |
testprogs/blackbox: add test_net_ads_search_server.sh
This reproduces a regression with
'net ads search -P --server server.of.trusted.domain'
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15323
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 3b585f9e8cc320841fab4cd5c3be53788d0a87ac)
| -rw-r--r-- | selftest/knownfail.d/samba4.blackbox.net_ads_search_server_P | 1 | ||||
| -rwxr-xr-x | source4/selftest/tests.py | 11 | ||||
| -rwxr-xr-x | testprogs/blackbox/test_net_ads_search_server.sh | 37 |
3 files changed, 49 insertions, 0 deletions
diff --git a/selftest/knownfail.d/samba4.blackbox.net_ads_search_server_P b/selftest/knownfail.d/samba4.blackbox.net_ads_search_server_P new file mode 100644 index 00000000000..7f06e3fe738 --- /dev/null +++ b/selftest/knownfail.d/samba4.blackbox.net_ads_search_server_P @@ -0,0 +1 @@ +^samba4.blackbox.net_ads_search_server_P.trust diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 29801bc190b..336d13be8b2 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -666,6 +666,17 @@ plantestsuite("samba4.blackbox.client_etypes_strong(ad_dc:client)", "ad_dc:clien 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']) +env = "ad_member:local" +plantestsuite("samba4.blackbox.net_ads_search_server_P.primary", env, + [os.path.join(bbdir, "test_net_ads_search_server.sh"), + '$DC_SERVER', '$REALM']) +plantestsuite("samba4.blackbox.net_ads_search_server_P.trust_e_both", env, + [os.path.join(bbdir, "test_net_ads_search_server.sh"), + '$TRUST_E_BOTH_SERVER', '$TRUST_E_BOTH_REALM']) +plantestsuite("samba4.blackbox.net_ads_search_server_P.trust_f_both", env, + [os.path.join(bbdir, "test_net_ads_search_server.sh"), + '$TRUST_F_BOTH_SERVER', '$TRUST_F_BOTH_REALM']) + if have_gnutls_fips_mode_support: plantestsuite("samba4.blackbox.weak_crypto.client", "ad_dc", [os.path.join(bbdir, "test_weak_crypto.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', "$PREFIX/ad_dc"]) plantestsuite("samba4.blackbox.test_weak_disable_ntlmssp_ldap", "ad_member:local", [os.path.join(bbdir, "test_weak_disable_ntlmssp_ldap.sh"),'$DC_USERNAME', '$DC_PASSWORD']) diff --git a/testprogs/blackbox/test_net_ads_search_server.sh b/testprogs/blackbox/test_net_ads_search_server.sh new file mode 100755 index 00000000000..f8350c9a97a --- /dev/null +++ b/testprogs/blackbox/test_net_ads_search_server.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +if [ $# -lt 2 ]; then +cat <<EOF +Usage: $0 SERVER REALM +EOF +exit 1; +fi + +SERVER=$1 +REALM=$2 +shift 2 + +failed=0 +. `dirname $0`/subunit.sh + +samba_net="$BINDIR/net" + +DN=$(echo "${REALM}" | tr '[:upper:]' '[:lower:]' | sed -e 's!^!DC=!' -e 's!\.!,DC=!g') +testit_grep_count \ + "net_ads_search.ntlmssp" \ + "distinguishedName: ${DN}" \ + 1 \ + $samba_net ads search --use-kerberos=off -P \ + --server "${SERVER}.${REALM}" \ + '(objectClass=domain)' distinguishedName || \ + failed=$((failed + 1)) +testit_grep_count \ + "net_ads_search.krb5" \ + "distinguishedName: ${DN}" \ + 1 \ + $samba_net ads search --use-kerberos=required -P \ + --server "${SERVER}.${REALM}" \ + '(objectClass=domain)' distinguishedName || \ + failed=$((failed + 1)) + +exit $failed |