Rework samdb handling for 'netlogon' packets.

[metze/samba/wip.git] / source / nbt_server / dgram / netlogon.c

diff --git a/source/nbt_server/dgram/netlogon.c b/source/nbt_server/dgram/netlogon.c
index c66089523b7f5de0418df0a2beb29d8bcff722a4..5e95270b7d2f8f01960b552055748fd308dd454f 100644 (file)
--- a/source/nbt_server/dgram/netlogon.c
+++ b/source/nbt_server/dgram/netlogon.c
@@ -38,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)
 {
@@ -57,11 +56,7 @@ static void nbtd_netlogon_getdc(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 (!samdb_is_pdc(samctx)) {
                DEBUG(2, ("Not a PDC, so not processing LOGON_PRIMARY_QUERY\n"));
@@ -106,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)
 {
@@ -128,25 +122,16 @@ 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) {
-                       DEBUG(2,("NBT netlogon query failed because SID specified in request to NTLOGON\n"));
-                       /* SID not permitted on NTLOGON (for some reason...) */ 
-                       return;
-               }
                sid = &netlogon->req.logon.sid;
        } else {
                sid = NULL;
        }
 
        status = fill_netlogon_samlogon_response(samctx, packet, NULL, name->name, sid, NULL, 
-                                                netlogon->req.logon.user_name, src->addr, 
+                                                netlogon->req.logon.user_name, netlogon->req.logon.acct_control, src->addr, 
                                                 netlogon->req.logon.nt_version, iface->nbtsrv->task->lp_ctx, &netlogon_response.samlogon);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(2,("NBT netlogon query failed domain=%s sid=%s version=%d - %s\n",
@@ -171,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;
@@ -200,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: