s4-loadparm: 2nd half of lp_ to lpcfg_ conversion

[kamenim/samba.git] / source4 / nbt_server / dgram / netlogon.c

diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index c5b16fbd7576b5c72fb1dc5b752518aed2f4cb11..8e231ccc23326cfd28818cbcc5dcd39793b10122 100644 (file)
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -31,6 +31,7 @@
 #include "smbd/service_task.h"
 #include "cldap_server/cldap_server.h"
 #include "libcli/security/security.h"
+#include "nbt_server/dgram/proto.h"
 
 /*
   reply to a GETDC request
@@ -44,12 +45,8 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
        struct nbt_name *name = &packet->data.msg.dest_name;
        struct nbtd_interface *reply_iface = nbtd_find_reply_iface(iface, src->addr, false);
        struct nbt_netlogon_response_from_pdc *pdc;
-       const char *ref_attrs[] = {"nETBIOSName", NULL};
-       struct ldb_message **ref_res;
        struct ldb_context *samctx;
-       struct ldb_dn *partitions_basedn;
        struct nbt_netlogon_response netlogon_response;
-       int ret;
 
        /* only answer getdc requests on the PDC or LOGON names */
        if (name->type != NBT_NAME_PDC && name->type != NBT_NAME_LOGON) {
@@ -58,19 +55,14 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
 
        samctx = iface->nbtsrv->sam_ctx;
 
-       if (!samdb_is_pdc(samctx)) {
+       if (lpcfg_server_role(iface->nbtsrv->task->lp_ctx) != ROLE_DOMAIN_CONTROLLER
+           || !samdb_is_pdc(samctx)) {
                DEBUG(2, ("Not a PDC, so not processing LOGON_PRIMARY_QUERY\n"));
                return;         
        }
 
-       partitions_basedn = samdb_partitions_dn(samctx, packet);
-
-       ret = gendb_search(samctx, packet, partitions_basedn, &ref_res, ref_attrs,
-                          "(&(&(nETBIOSName=%s)(objectclass=crossRef))(ncName=*))", 
-                          name->name);
-       
-       if (ret != 1) {
-               DEBUG(2,("Unable to find domain reference '%s' in sam\n", name->name));
+       if (strcasecmp_m(name->name, lpcfg_workgroup(iface->nbtsrv->task->lp_ctx)) != 0) {
+               DEBUG(5,("GetDC requested for a domian %s that we don't host\n", name->name));
                return;
        }
 
@@ -80,16 +72,16 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
        pdc = &netlogon_response.data.get_pdc;
 
        pdc->command = NETLOGON_RESPONSE_FROM_PDC;
-       pdc->pdc_name         = lp_netbios_name(iface->nbtsrv->task->lp_ctx);
+       pdc->pdc_name         = lpcfg_netbios_name(iface->nbtsrv->task->lp_ctx);
        pdc->unicode_pdc_name = pdc->pdc_name;
-       pdc->domain_name      = samdb_result_string(ref_res[0], "nETBIOSName", name->name);;
+       pdc->domain_name      = lpcfg_workgroup(iface->nbtsrv->task->lp_ctx);
        pdc->nt_version       = 1;
        pdc->lmnt_token       = 0xFFFF;
        pdc->lm20_token       = 0xFFFF;
 
        dgram_mailslot_netlogon_reply(reply_iface->dgmsock, 
                                      packet, 
-                                     lp_netbios_name(iface->nbtsrv->task->lp_ctx),
+                                     lpcfg_netbios_name(iface->nbtsrv->task->lp_ctx),
                                      netlogon->req.pdc.mailslot_name,
                                      &netlogon_response);
 }
@@ -132,7 +124,7 @@ static void nbtd_netlogon_samlogon(struct dgram_mailslot_handler *dgmslot,
 
        status = fill_netlogon_samlogon_response(samctx, packet, NULL, name->name, sid, NULL, 
                                                 netlogon->req.logon.user_name, netlogon->req.logon.acct_control, src->addr, 
-                                                netlogon->req.logon.nt_version, iface->nbtsrv->task->lp_ctx, &netlogon_response.data.samlogon);
+                                                netlogon->req.logon.nt_version, iface->nbtsrv->task->lp_ctx, &netlogon_response.data.samlogon, false);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(2,("NBT netlogon query failed domain=%s sid=%s version=%d - %s\n",
                         name->name, dom_sid_string(packet, sid), netlogon->req.logon.nt_version, nt_errstr(status)));
@@ -145,7 +137,7 @@ static void nbtd_netlogon_samlogon(struct dgram_mailslot_handler *dgmslot,
 
        dgram_mailslot_netlogon_reply(reply_iface->dgmsock, 
                                      packet, 
-                                     lp_netbios_name(iface->nbtsrv->task->lp_ctx),
+                                     lpcfg_netbios_name(iface->nbtsrv->task->lp_ctx),
                                      netlogon->req.logon.mailslot_name,
                                      &netlogon_response);
 }
@@ -160,7 +152,7 @@ void nbtd_mailslot_netlogon_handler(struct dgram_mailslot_handler *dgmslot,
 {
        NTSTATUS status = NT_STATUS_NO_MEMORY;
        struct nbtd_interface *iface = 
-               talloc_get_type(dgmslot->private, struct nbtd_interface);
+               talloc_get_type(dgmslot->private_data, struct nbtd_interface);
        struct nbt_netlogon_packet *netlogon = 
                talloc(dgmslot, struct nbt_netlogon_packet);
        struct nbtd_iface_name *iname;