[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4228-g2334140

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  2334140b6c22f52930b7d168d6f26c18032d5efc (commit)
       via  16e9a454404a5a70985caf15d1b987fe6332d195 (commit)
       via  8d82a75ec9875137928c69370bbaf621bf4fc3fb (commit)
      from  46627792a69fd6d5a24f4ca69ad26c1f9e2213ff (commit)

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


- Log -----------------------------------------------------------------
commit 2334140b6c22f52930b7d168d6f26c18032d5efc
Merge: 16e9a454404a5a70985caf15d1b987fe6332d195 46627792a69fd6d5a24f4ca69ad26c1f9e2213ff
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Oct 6 14:20:16 2008 -0700

    Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test

commit 16e9a454404a5a70985caf15d1b987fe6332d195
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Oct 6 14:10:56 2008 -0700

    If name_to_fqdn fails, retry with the dns domain the DC gave us
    
    This is a workaround for the cases where you want to join under a netbios name
    that is different from your hostname, i.e. a name that can not be found in
    /etc/hosts or dns. In these cases, name_to_fqdn fails or gives invalid results.

commit 8d82a75ec9875137928c69370bbaf621bf4fc3fb
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Oct 6 14:10:42 2008 -0700

    Log in the parent winbind log where a request is going

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

Summary of changes:
 source/libnet/libnet_join.c     |   11 ++++++++---
 source/winbindd/winbindd_dual.c |    4 ++++
 2 files changed, 12 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index a39dee6..75aafde 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -357,10 +357,15 @@ static ADS_STATUS libnet_join_set_machine_spn(TALLOC_CTX *mem_ctx,
 	strupper_m(spn);
 	spn_array[0] = spn;
 
-	if (name_to_fqdn(my_fqdn, r->in.machine_name) &&
-	    !strequal(my_fqdn, r->in.machine_name)) {
+	if (!name_to_fqdn(my_fqdn, r->in.machine_name)
+	    || (strchr(my_fqdn, '.') == NULL)) {
+		fstr_sprintf(my_fqdn, "%s.%s", r->in.machine_name,
+			r->out.dns_domain_name);
+	}
+
+	strlower_m(my_fqdn);
 
-		strlower_m(my_fqdn);
+	if (!strequal(my_fqdn, r->in.machine_name)) {
 		spn = talloc_asprintf(mem_ctx, "HOST/%s", my_fqdn);
 		if (!spn) {
 			return ADS_ERROR_LDAP(LDAP_NO_MEMORY);
diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
index 9e9a244..e57fd70 100644
--- a/source/winbindd/winbindd_dual.c
+++ b/source/winbindd/winbindd_dual.c
@@ -120,6 +120,10 @@ void async_request(TALLOC_CTX *mem_ctx, struct winbindd_child *child,
 
 	SMB_ASSERT(continuation != NULL);
 
+	DEBUG(10, ("Sending request to child pid %d (domain=%s)\n",
+		(int)child->pid,
+		(child->domain != NULL) ? child->domain->name : "''"));
+
 	state = TALLOC_P(mem_ctx, struct winbindd_async_request);
 
 	if (state == NULL) {


-- 
Samba Shared Repository