svn commit: samba r17634 - in branches/SAMBA_4_0/source/nbt_server/dgram: .

[abartlet at samba.org]

Author: abartlet
Date: 2006-08-20 21:58:02 +0000 (Sun, 20 Aug 2006)
New Revision: 17634

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17634

Log:
Kill off another case where we used dnsDomain, and point it again at
dnsRoot.

Fix to read the nETBIOSName from the correct result.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/nbt_server/dgram/netlogon.c


Changeset:
Modified: branches/SAMBA_4_0/source/nbt_server/dgram/netlogon.c
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/dgram/netlogon.c	2006-08-20 21:57:08 UTC (rev 17633)
+++ branches/SAMBA_4_0/source/nbt_server/dgram/netlogon.c	2006-08-20 21:58:02 UTC (rev 17634)
@@ -103,8 +103,8 @@
 	struct nbt_netlogon_packet reply;
 	struct nbt_netlogon_response_from_pdc2 *pdc;
 	struct ldb_context *samctx;
-	const char *ref_attrs[] = {"nETBIOSName", "ncName", NULL};
-	const char *dom_attrs[] = {"dnsDomain", "objectGUID", NULL};
+	const char *ref_attrs[] = {"nETBIOSName", "dnsRoot", "ncName", NULL};
+	const char *dom_attrs[] = {"objectGUID", NULL};
 	struct ldb_message **ref_res, **dom_res;
 	int ret;
 	const char **services = lp_server_services();
@@ -178,14 +178,14 @@
 	}
 
 	pdc->domain_uuid      = samdb_result_guid(dom_res[0], "objectGUID");
-	pdc->forest           = samdb_result_string(dom_res[0], "dnsDomain", lp_realm());
-	pdc->dns_domain       = samdb_result_string(dom_res[0], "dnsDomain", lp_realm());
+	pdc->forest           = samdb_result_string(ref_res[0], "dnsRoot", lp_realm());
+	pdc->dns_domain       = samdb_result_string(ref_res[0], "dnsRoot", lp_realm());
 
 	/* TODO: get our full DNS name from somewhere else */
 	pdc->pdc_dns_name     = talloc_asprintf(packet, "%s.%s", 
 						strlower_talloc(packet, lp_netbios_name()), 
 						pdc->dns_domain);
-	pdc->domain           = samdb_result_string(dom_res[0], "nETBIOSName", name->name);;
+	pdc->domain           = samdb_result_string(ref_res[0], "nETBIOSName", name->name);;
 	pdc->pdc_name         = lp_netbios_name();
 	pdc->user_name        = netlogon->req.pdc2.user_name;
 	/* TODO: we need to make sure these are in our DNS zone */