diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-08-20 21:58:02 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:16:18 -0500 |
| commit | 0148cfae31e982e893b6a2ca0fba014b6deb449b (patch) | |
| tree | 6f73f893868576d9ae4d2b3cefb2fa65d636269d /source4 | |
| parent | 3d603bdd66643ce1d9b530978644c7aa747145fd (diff) | |
| download | samba-0148cfae31e982e893b6a2ca0fba014b6deb449b.tar.gz samba-0148cfae31e982e893b6a2ca0fba014b6deb449b.tar.bz2 samba-0148cfae31e982e893b6a2ca0fba014b6deb449b.zip | |
r17634: 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
(This used to be commit dc37c48724115940094a0f6003ee2f74fe81d102)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/nbt_server/dgram/netlogon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c index 9a6b8a2887..2a600120d1 100644 --- a/source4/nbt_server/dgram/netlogon.c +++ b/source4/nbt_server/dgram/netlogon.c @@ -103,8 +103,8 @@ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot, 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 @@ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot, } 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 */ |