r25398: Parse loadparm context to all lp_*() functions.

[gd/samba-autobuild/.git] / source4 / nbt_server / dgram / netlogon.c

diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index eb06abd74ac022707321bfa52ba8e8b03715dd9d..ba32bb123e4e855b470ba8fc47b20d3f1cdd706c 100644 (file)
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -75,7 +75,7 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
        reply.command = NETLOGON_RESPONSE_FROM_PDC;
        pdc = &reply.req.response;
 
-       pdc->pdc_name         = lp_netbios_name();
+       pdc->pdc_name         = lp_netbios_name(global_loadparm);
        pdc->unicode_pdc_name = pdc->pdc_name;
        pdc->domain_name      = samdb_result_string(ref_res[0], "nETBIOSName", name->name);;
        pdc->nt_version       = 1;
@@ -110,7 +110,7 @@ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot,
        const char *dom_attrs[] = {"objectGUID", NULL};
        struct ldb_message **ref_res, **dom_res;
        int ret;
-       const char **services = lp_server_services();
+       const char **services = lp_server_services(global_loadparm);
        const char *my_ip = reply_iface->ip_address; 
        struct ldb_dn *partitions_basedn;
        if (!my_ip) {
@@ -183,15 +183,18 @@ 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(ref_res[0], "dnsRoot", lp_realm());
-       pdc->dns_domain       = samdb_result_string(ref_res[0], "dnsRoot", lp_realm());
+       pdc->forest           = samdb_result_string(ref_res[0], "dnsRoot", 
+                                                   lp_realm(global_loadparm));
+       pdc->dns_domain       = samdb_result_string(ref_res[0], "dnsRoot", 
+                                                   lp_realm(global_loadparm));
 
        /* TODO: get our full DNS name from somewhere else */
        pdc->pdc_dns_name     = talloc_asprintf(packet, "%s.%s", 
-                                               strlower_talloc(packet, lp_netbios_name()), 
+                                               strlower_talloc(packet, 
+                                                               lp_netbios_name(global_loadparm)), 
                                                pdc->dns_domain);
        pdc->domain           = samdb_result_string(ref_res[0], "nETBIOSName", name->name);;
-       pdc->pdc_name         = lp_netbios_name();
+       pdc->pdc_name         = lp_netbios_name(global_loadparm);
        pdc->user_name        = netlogon->req.pdc2.user_name;
        /* TODO: we need to make sure these are in our DNS zone */
        pdc->server_site      = "Default-First-Site-Name";