Attachment 15899 Details for Bug 14336 – patch for 4.12

[patch] patch for 4.12

v4-12.patch (text/plain), 3.10 KB, created by Andreas Schneider on 2020-04-07 06:59:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2020-04-07 06:59:07 UTC

Size: 3.10 KB

patch

obsolete

>From 6d9f71e6db471febfa0e45fa6a2cfdc423e64bec Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Fri, 3 Apr 2020 15:58:28 +0200
>Subject: [PATCH 1/2] s3:libads: Fix ads_get_upn()
>
>This adds the userPrincipalName to ads_find_machine_acct() which
>fetches the data for us.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14336
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>(cherry picked from commit ec69752cb963ae850568d3f4905d2941e485627e)
>---
> source3/libads/ldap.c | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
>index a630c5a0345..f0fcf9fcd56 100755
>--- a/source3/libads/ldap.c
>+++ b/source3/libads/ldap.c
>@@ -1373,6 +1373,7 @@ char *ads_parent_dn(const char *dn)
> 		"userAccountControl",
> 		"DnsHostName",
> 		"ServicePrincipalName",
>+		"userPrincipalName",
> 		"unicodePwd",
> 
> 		/* Additional attributes Samba checks */
>-- 
>2.26.0
>
>
>From 2ca2f380a20b5fe73028df51393173e6b068b413 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Fri, 3 Apr 2020 15:40:48 +0200
>Subject: [PATCH 2/2] testprogs: Add 'net ads join createupn' test also
> verifying the keytab
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14336
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Mon Apr  6 19:09:53 UTC 2020 on sn-devel-184
>
>(cherry picked from commit c4be195da2845be4f64e47883e3c911dedd90e48)
>---
> testprogs/blackbox/test_net_ads.sh | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
>diff --git a/testprogs/blackbox/test_net_ads.sh b/testprogs/blackbox/test_net_ads.sh
>index 8bcff006b8e..95c0cf76f90 100755
>--- a/testprogs/blackbox/test_net_ads.sh
>+++ b/testprogs/blackbox/test_net_ads.sh
>@@ -237,6 +237,23 @@ testit "leave+createcomputer" $VALGRIND $net_tool ads leave -U$DC_USERNAME%$DC_P
> 
> testit "Remove OU=Servers" $VALGRIND $ldbdel -U$DC_USERNAME%$DC_PASSWORD -H ldap://$SERVER "OU=Servers,$base_dn"
> 
>+#
>+# Test createupn option of 'net ads join'
>+#
>+testit "join+createupn" $VALGRIND $net_tool ads join -U$DC_USERNAME%$DC_PASSWORD createupn="host/test-$HOSTNAME@$REALM" || failed=`expr $failed + 1`
>+
>+testit_grep "checkupn" "userPrincipalName: host/test-$HOSTNAME@$REALM" $ldbsearch -U$DC_USERNAME%$DC_PASSWORD -H ldap://$SERVER.$REALM -s base -b "CN=$HOSTNAME,CN=Computers,$base_dn" || failed=`expr $failed + 1`
>+
>+dedicated_keytab_file="$PREFIX_ABS/test_net_create_dedicated_krb5.keytab"
>+
>+testit "create_keytab" $VALGRIND $net_tool ads keytab create --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1`
>+
>+testit_grep "checkupn+keytab" "host/test-$HOSTNAME@$REALM" $net_tool ads keytab list --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1`
>+
>+rm -f $dedicated_keytab_file
>+
>+testit "leave+createupn" $VALGRIND $net_tool ads leave -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1`
>+
> rm -rf $BASEDIR/$WORKDIR
> 
> exit $failed
>-- 
>2.26.0
>

Flags:

ab: review+

Actions: View

Attachments on bug 14336: 15899 | 15900