[SCM] Samba Shared Repository - branch v4-4-test updated

[Karolin Seeger]

The branch, v4-4-test has been updated
       via  2b63c23 libnet_join: use sitename if it was set by pre-join detection
      from  53ac611 s3: krb5: keytab - The done label can be jumped to with context == NULL.

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-test


- Log -----------------------------------------------------------------
commit 2b63c23f5ca415047b1a5cbbd73ce891fab92980
Author: Alexander Bokovoy <ab at samba.org>
Date:   Tue Jun 14 22:37:31 2016 +0300

    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 at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Wed Jun 15 15:25:44 CEST 2016 on sn-devel-144
    
    (cherry picked from commit 4c408f6de5c32a41fbb44971419118e5425d13e7)
    
    Autobuild-User(v4-4-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-4-test): Thu Jun 16 14:42:21 CEST 2016 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source3/libnet/libnet_join.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

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)) {


-- 
Samba Shared Repository