[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  710988c s3: Retry the join with the short name
       via  691299c s3: Initialize output in libnet_Join
       via  4787c32 s3: For net ads join, create a krb5.conf
      from  7de5b20 s3-util: separate out cmdline helpers.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 710988c69c98736aeab1174dbf46b5ab3d053d33
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Feb 26 17:53:16 2011 +0100

    s3: Retry the join with the short name
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit feb3cdee366a439e8526f439714c9068068cdaa4)

commit 691299cc72ca5897cae7f130c518e5ddc1ebeb40
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Feb 26 18:12:32 2011 +0100

    s3: Initialize output in libnet_Join
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit da5e5a6a83a6dcf04c51497f8b5f10621d7b47f7)

commit 4787c32934d885bd0084359a28c33b30bb523124
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Feb 26 18:12:49 2011 +0100

    s3: For net ads join, create a krb5.conf
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue Apr 12 14:10:05 CEST 2011 on sn-devel-104
    (cherry picked from commit 4edc98eb9e18eff00bb5ce9bdcdffa5b11149dd4)

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

Summary of changes:
 source3/libnet/libnet_join.c |    7 +++++++
 source3/utils/net_ads.c      |    5 +++++
 2 files changed, 12 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index e702ffc..1e866c3 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -1974,6 +1974,11 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
 	}
 
 #ifdef HAVE_ADS
+
+	create_local_private_krb5_conf_for_domain(
+		r->out.dns_domain_name, r->out.netbios_domain_name,
+		NULL, &cli->dest_ss, cli->desthost);
+
 	if (r->out.domain_is_ad && r->in.account_ou &&
 	    !(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_UNSECURE)) {
 
@@ -2068,6 +2073,8 @@ WERROR libnet_Join(TALLOC_CTX *mem_ctx,
 		LIBNET_JOIN_IN_DUMP_CTX(mem_ctx, r);
 	}
 
+	ZERO_STRUCT(r->out);
+
 	werr = libnet_join_pre_processing(mem_ctx, r);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index e6ac1c9..ca5c1bf 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1412,6 +1412,11 @@ int net_ads_join(struct net_context *c, int argc, const char **argv)
 	r->in.msg_ctx		= c->msg_ctx;
 
 	werr = libnet_Join(ctx, r);
+	if (W_ERROR_EQUAL(werr, WERR_DCNOTFOUND) &&
+	    strequal(domain, lp_realm())) {
+		r->in.domain_name = lp_workgroup();
+		werr = libnet_Join(ctx, r);
+	}
 	if (!W_ERROR_IS_OK(werr)) {
 		goto fail;
 	}


-- 
Samba Shared Repository