Attachment 12180 Details for Bug 11975 – patch for 4.4

[patch] patch for 4.4

4-4.patch (text/plain), 1.70 KB, created by Andreas Schneider on 2016-06-15 13:48:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2016-06-15 13:48:18 UTC

Size: 1.70 KB

patch

obsolete

>From a3978285d05eb0bd9b52b0d1c2908388005b32e1 Mon Sep 17 00:00:00 2001
>From: Alexander Bokovoy <ab@samba.org>
>Date: Tue, 14 Jun 2016 22:37:31 +0300
>Subject: [PATCH] libnet_join: use sitename if it was set by pre-join detection
>
>When domain member is joined to AD, we need to use the same DC to
>authenticate against after the join because the machine account might
>not be replicated yet to other domain controllers, including off-site.
>
>Bug https://bugzilla.samba.org/show_bug.cgi?id=11769 dealt with
>detection of the site pre-join. However, we rewrite private local
>krb5.conf afterwards without taking the discovered site name into
>account.
>
>Fix this by reusing the site discovered pre-join.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11975
>
>Signed-off-by: Alexander Bokovoy <ab@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Wed Jun 15 15:25:44 CEST 2016 on sn-devel-144
>
>(cherry picked from commit 4c408f6de5c32a41fbb44971419118e5425d13e7)
>---
> source3/libnet/libnet_join.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
>index a28864d..c007183 100644
>--- a/source3/libnet/libnet_join.c
>+++ b/source3/libnet/libnet_join.c
>@@ -2500,7 +2500,7 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
> 
> 	create_local_private_krb5_conf_for_domain(
> 		r->out.dns_domain_name, r->out.netbios_domain_name,
>-		NULL, smbXcli_conn_remote_sockaddr(cli->conn));
>+		sitename, smbXcli_conn_remote_sockaddr(cli->conn));
> 
> 	if (r->out.domain_is_ad &&
> 	    !(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_UNSECURE)) {
>-- 
>2.9.0
>

Flags:

ab: review+

Actions: View

Attachments on bug 11975: 12180