nbt_server: Remove some unused parameters

[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 8e231ccc23326cfd28818cbcc5dcd39793b10122..879e21dc63832fd6daa16425c3a2a5eaecfb824c 100644 (file)
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -23,21 +23,20 @@
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
 #include "lib/socket/socket.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "../lib/util/util_ldb.h"
 #include "param/param.h"
 #include "smbd/service_task.h"
-#include "cldap_server/cldap_server.h"
+#include "dsdb/samdb/ldb_modules/util.h"
 #include "libcli/security/security.h"
 #include "nbt_server/dgram/proto.h"
+#include "libds/common/roles.h"
 
 /*
   reply to a GETDC request
  */
-static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot, 
-                               struct nbtd_interface *iface,
+static void nbtd_netlogon_getdc(struct nbtd_interface *iface,
                                struct nbt_dgram_packet *packet, 
                                const struct socket_address *src,
                                struct nbt_netlogon_packet *netlogon)
@@ -55,7 +54,7 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
 
        samctx = iface->nbtsrv->sam_ctx;
 
-       if (lpcfg_server_role(iface->nbtsrv->task->lp_ctx) != ROLE_DOMAIN_CONTROLLER
+       if (lpcfg_server_role(iface->nbtsrv->task->lp_ctx) != ROLE_ACTIVE_DIRECTORY_DC
            || !samdb_is_pdc(samctx)) {
                DEBUG(2, ("Not a PDC, so not processing LOGON_PRIMARY_QUERY\n"));
                return;         
@@ -90,8 +89,7 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
 /*
   reply to a ADS style GETDC request
  */
-static void nbtd_netlogon_samlogon(struct dgram_mailslot_handler *dgmslot,
-                                  struct nbtd_interface *iface,
+static void nbtd_netlogon_samlogon(struct nbtd_interface *iface,
                                   struct nbt_dgram_packet *packet, 
                                   const struct socket_address *src,
                                   struct nbt_netlogon_packet *netlogon)
@@ -169,19 +167,18 @@ void nbtd_mailslot_netlogon_handler(struct dgram_mailslot_handler *dgmslot,
                goto failed;
        }
 
-       DEBUG(2,("netlogon request to %s from %s:%d\n", 
+       DEBUG(5,("netlogon request to %s from %s:%d\n",
                 nbt_name_string(netlogon, name), src->addr, src->port));
-       status = dgram_mailslot_netlogon_parse_request(dgmslot, netlogon, packet, netlogon);
+       status = dgram_mailslot_netlogon_parse_request(netlogon, packet,
+                                                      netlogon);
        if (!NT_STATUS_IS_OK(status)) goto failed;
 
        switch (netlogon->command) {
        case LOGON_PRIMARY_QUERY:
-               nbtd_netlogon_getdc(dgmslot, iface, packet, 
-                                   src, netlogon);
+               nbtd_netlogon_getdc(iface, packet, src, netlogon);
                break;
        case LOGON_SAM_LOGON_REQUEST:
-               nbtd_netlogon_samlogon(dgmslot, iface, packet, 
-                                      src, netlogon);
+               nbtd_netlogon_samlogon(iface, packet, src, netlogon);
                break;
        default:
                DEBUG(2,("unknown netlogon op %d from %s:%d\n",