From: Volker Lendecke <vl@samba.org>
Date: Mon, 6 Oct 2008 21:10:23 +0000 (-0700)
Subject: If name_to_fqdn fails, retry with the dns domain the DC gave us
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84951b54bc1473aa9275c02cc37a9f0d7d4150e2;p=thirdparty%2Fsamba.git

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.
---

diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index 86cbce02242..7451cb27c6f 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);