diff options
| author | Isaac Boukris <iboukris@gmail.com> | 2020-06-16 22:01:49 +0300 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2020-06-24 09:57:26 +0000 |
| commit | 60e7328219169d949e5a864e322fb2de57c4ffd3 (patch) | |
| tree | d2ef420c0d163aa669d7113863f4e9d27f41d9a8 | |
| parent | 63c70acd4f473d709c25a7c35398db98d4504981 (diff) | |
| download | samba-60e7328219169d949e5a864e322fb2de57c4ffd3.tar.gz | |
selftest: add tests for binary msDS-AdditionalDnsHostName
Like the short names added implicitly by Windows DC.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14406
Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
| -rw-r--r-- | selftest/knownfail.d/binary_addl_hostname | 3 | ||||
| -rwxr-xr-x | testprogs/blackbox/test_net_ads.sh | 22 |
2 files changed, 25 insertions, 0 deletions
diff --git a/selftest/knownfail.d/binary_addl_hostname b/selftest/knownfail.d/binary_addl_hostname new file mode 100644 index 00000000000..559db1df507 --- /dev/null +++ b/selftest/knownfail.d/binary_addl_hostname @@ -0,0 +1,3 @@ +^samba4.blackbox.net_ads.dns alias1 check keytab +^samba4.blackbox.net_ads.dns alias2 check keytab +^samba4.blackbox.net_ads.addl short check keytab diff --git a/testprogs/blackbox/test_net_ads.sh b/testprogs/blackbox/test_net_ads.sh index 85257f445d8..eef4a31a6a7 100755 --- a/testprogs/blackbox/test_net_ads.sh +++ b/testprogs/blackbox/test_net_ads.sh @@ -41,6 +41,11 @@ if [ -x "$BINDIR/ldbdel" ]; then ldbdel="$BINDIR/ldbdel" fi +ldbmodify="ldbmodify" +if [ -x "$BINDIR/ldbmodify" ]; then + ldbmodify="$BINDIR/ldbmodify" +fi + # Load test functions . `dirname $0`/subunit.sh @@ -217,12 +222,29 @@ testit_grep "dns alias SPN" $dns_alias2 $VALGRIND $net_tool ads search -P samacc testit_grep "dns alias addl" $dns_alias1 $VALGRIND $net_tool ads search -P samaccountname=$netbios\$ msDS-AdditionalDnsHostName || failed=`expr $failed + 1` testit_grep "dns alias addl" $dns_alias2 $VALGRIND $net_tool ads search -P samaccountname=$netbios\$ msDS-AdditionalDnsHostName || failed=`expr $failed + 1` +# Test binary msDS-AdditionalDnsHostName like ones added by Windows DC +short_alias_file="$PREFIX_ABS/short_alias_file" +printf 'short_alias\0$' > $short_alias_file +cat > $PREFIX_ABS/tmpldbmodify <<EOF +dn: CN=$HOSTNAME,$computers_dn +changetype: modify +add: msDS-AdditionalDnsHostName +msDS-AdditionalDnsHostName:< file://$short_alias_file +EOF + +testit "add binary msDS-AdditionalDnsHostName" $VALGRIND $ldbmodify -k yes -U$DC_USERNAME%$DC_PASSWORD -H ldap://$SERVER.$REALM $PREFIX_ABS/tmpldbmodify || failed=`expr $failed + 1` + +testit_grep "addl short alias" short_alias $ldbsearch --show-binary -U$DC_USERNAME%$DC_PASSWORD -H ldap://$SERVER.$REALM -s base -b "CN=$HOSTNAME,CN=Computers,$base_dn" msDS-AdditionalDnsHostName || failed=`expr $failed + 1` + +rm -f $PREFIX_ABS/tmpldbmodify $short_alias_file + dedicated_keytab_file="$PREFIX_ABS/test_dns_aliases_dedicated_krb5.keytab" testit "dns alias create_keytab" $VALGRIND $net_tool ads keytab create --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1` testit_grep "dns alias1 check keytab" "host/${dns_alias1}@$REALM" $net_tool ads keytab list --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1` testit_grep "dns alias2 check keytab" "host/${dns_alias2}@$REALM" $net_tool ads keytab list --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1` +testit_grep "addl short check keytab" "host/short_alias@$REALM" $net_tool ads keytab list --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1` rm -f $dedicated_keytab_file |