Fix include paths to new location of libutil.

[bbaumbach/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 ae24a7cd2b1dfef862c1428556d53cc2bc337796..c5b16fbd7576b5c72fb1dc5b752518aed2f4cb11 100644 (file)
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -26,10 +26,11 @@
 #include "lib/ldb/include/ldb.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "util/util_ldb.h"
+#include "../lib/util/util_ldb.h"
 #include "param/param.h"
 #include "smbd/service_task.h"
 #include "cldap_server/cldap_server.h"
+#include "libcli/security/security.h"
 
 /*
   reply to a GETDC request
@@ -37,7 +38,6 @@
 static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot, 
                                struct nbtd_interface *iface,
                                struct nbt_dgram_packet *packet, 
-                               const char *mailslot_name,
                                const struct socket_address *src,
                                struct nbt_netlogon_packet *netlogon)
 {
@@ -51,15 +51,16 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
        struct nbt_netlogon_response netlogon_response;
        int ret;
 
-       /* only answer getdc requests on the PDC name */
-       if (name->type != NBT_NAME_PDC) {
+       /* only answer getdc requests on the PDC or LOGON names */
+       if (name->type != NBT_NAME_PDC && name->type != NBT_NAME_LOGON) {
                return;
        }
 
-       samctx = samdb_connect(packet, iface->nbtsrv->task->event_ctx, iface->nbtsrv->task->lp_ctx, anonymous_session(packet, iface->nbtsrv->task->event_ctx, iface->nbtsrv->task->lp_ctx));
-       if (samctx == NULL) {
-               DEBUG(2,("Unable to open sam in getdc reply\n"));
-               return;
+       samctx = iface->nbtsrv->sam_ctx;
+
+       if (!samdb_is_pdc(samctx)) {
+               DEBUG(2, ("Not a PDC, so not processing LOGON_PRIMARY_QUERY\n"));
+               return;         
        }
 
        partitions_basedn = samdb_partitions_dn(samctx, packet);
@@ -76,7 +77,7 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
        /* setup a GETDC reply */
        ZERO_STRUCT(netlogon_response);
        netlogon_response.response_type = NETLOGON_GET_PDC;
-       pdc = &netlogon_response.get_pdc;
+       pdc = &netlogon_response.data.get_pdc;
 
        pdc->command = NETLOGON_RESPONSE_FROM_PDC;
        pdc->pdc_name         = lp_netbios_name(iface->nbtsrv->task->lp_ctx);
@@ -100,7 +101,6 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
 static void nbtd_netlogon_samlogon(struct dgram_mailslot_handler *dgmslot,
                                   struct nbtd_interface *iface,
                                   struct nbt_dgram_packet *packet, 
-                                  const char *mailslot_name,
                                   const struct socket_address *src,
                                   struct nbt_netlogon_packet *netlogon)
 {
@@ -122,29 +122,25 @@ static void nbtd_netlogon_samlogon(struct dgram_mailslot_handler *dgmslot,
                return;
        }
 
-       samctx = samdb_connect(packet, iface->nbtsrv->task->event_ctx, iface->nbtsrv->task->lp_ctx, anonymous_session(packet, iface->nbtsrv->task->event_ctx, iface->nbtsrv->task->lp_ctx));
-       if (samctx == NULL) {
-               DEBUG(2,("Unable to open sam in getdc reply\n"));
-               return;
-       }
+       samctx = iface->nbtsrv->sam_ctx;
 
        if (netlogon->req.logon.sid_size) {
-               if (strcasecmp(mailslot_name, NBT_MAILSLOT_NTLOGON) == 0) {
-                       /* SID not permitted on NTLOGON (for some reason...) */ 
-                       return;
-               }
                sid = &netlogon->req.logon.sid;
        } else {
                sid = NULL;
        }
 
-       status = fill_netlogon_samlogon_response(samctx, packet, name->name, sid, NULL, 
-                                                netlogon->req.logon.user_name, src->addr, 
-                                                netlogon->req.logon.nt_version, iface->nbtsrv->task->lp_ctx, &netlogon_response.samlogon);
+       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);
        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)));
                return;
        }
 
+       netlogon_response.response_type = NETLOGON_SAMLOGON;
+
        packet->data.msg.dest_name.type = 0;
 
        dgram_mailslot_netlogon_reply(reply_iface->dgmsock, 
@@ -160,7 +156,6 @@ static void nbtd_netlogon_samlogon(struct dgram_mailslot_handler *dgmslot,
 */
 void nbtd_mailslot_netlogon_handler(struct dgram_mailslot_handler *dgmslot, 
                                    struct nbt_dgram_packet *packet, 
-                                   const char *mailslot_name,
                                    struct socket_address *src)
 {
        NTSTATUS status = NT_STATUS_NO_MEMORY;
@@ -189,11 +184,11 @@ void nbtd_mailslot_netlogon_handler(struct dgram_mailslot_handler *dgmslot,
 
        switch (netlogon->command) {
        case LOGON_PRIMARY_QUERY:
-               nbtd_netlogon_getdc(dgmslot, iface, packet, mailslot_name, 
+               nbtd_netlogon_getdc(dgmslot, iface, packet, 
                                    src, netlogon);
                break;
        case LOGON_SAM_LOGON_REQUEST:
-               nbtd_netlogon_samlogon(dgmslot, iface, packet, mailslot_name, 
+               nbtd_netlogon_samlogon(dgmslot, iface, packet, 
                                       src, netlogon);
                break;
        default: