Changeset 745 for trunk/server/source4/nbt_server/dgram

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/nbt_server/dgram/browse.c (modified) (1 diff)
• source4/nbt_server/dgram/netlogon.c (modified) (7 diffs)
• source4/nbt_server/dgram/ntlogon.c (modified) (2 diffs)
• source4/nbt_server/dgram/request.c (modified) (6 diffs)

trunk/server/source4/nbt_server/dgram/browse.c

@@ -65 +65 @@
         if (!NT_STATUS_IS_OK(status)) goto failed;
 
-        DEBUG(2,("Browse %s (Op %d) on '%s' '%s' from %s:%d\n", 
+        DEBUG(4,("Browse %s (Op %d) on '%s' '%s' from %s:%d\n", 
                 nbt_browse_opcode_string(browse->opcode), browse->opcode,
                 nbt_name_string(browse, name), dgmslot->mailslot_name,

trunk/server/source4/nbt_server/dgram/netlogon.c

@@ -24 +24 @@
 #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"
@@ -56 +55 @@
         samctx = iface->nbtsrv->sam_ctx;
 
-        if (lp_server_role(iface->nbtsrv->task->lp_ctx) != ROLE_DOMAIN_CONTROLLER
+        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"));
@@ -62 +61 @@
         }
 
-        if (strcasecmp_m(name->name, lp_workgroup(iface->nbtsrv->task->lp_ctx)) != 0) {
+        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;
@@ -73 +72 @@
 
         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      = lp_workgroup(iface->nbtsrv->task->lp_ctx);
+        pdc->domain_name      = lpcfg_workgroup(iface->nbtsrv->task->lp_ctx);
         pdc->nt_version       = 1;
         pdc->lmnt_token       = 0xFFFF;
@@ -82 +81 @@
         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);
@@ -125 +124 @@
         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",
@@ -138 +137 @@
         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);

trunk/server/source4/nbt_server/dgram/ntlogon.c

@@ -52 +52 @@
 
         logon->server           = talloc_asprintf(packet, "\\\\%s", 
-                                                  lp_netbios_name(iface->nbtsrv->task->lp_ctx));
+                                                  lpcfg_netbios_name(iface->nbtsrv->task->lp_ctx));
         logon->user_name        = ntlogon->req.logon.user_name;
-        logon->domain           = lp_workgroup(iface->nbtsrv->task->lp_ctx);
+        logon->domain           = lpcfg_workgroup(iface->nbtsrv->task->lp_ctx);
         logon->nt_version       = 1;
         logon->lmnt_token       = 0xFFFF;
@@ -63 +63 @@
         dgram_mailslot_ntlogon_reply(reply_iface->dgmsock, 
                                      packet, 
-                                     lp_netbios_name(iface->nbtsrv->task->lp_ctx),
+                                     lpcfg_netbios_name(iface->nbtsrv->task->lp_ctx),
                                      ntlogon->req.logon.mailslot_name,
                                      &reply);

trunk/server/source4/nbt_server/dgram/request.c

@@ -76 +76 @@
         if (strcmp("0.0.0.0", iface->netmask) != 0) {
                 /* listen for broadcasts on port 138 */
-                bcast_dgmsock = nbt_dgram_socket_init(iface, 
-                                                      nbtsrv->task->event_ctx,
-                                                      lp_iconv_convenience(nbtsrv->task->lp_ctx));
+                bcast_dgmsock = nbt_dgram_socket_init(iface, nbtsrv->task->event_ctx);
                 if (!bcast_dgmsock) {
                         talloc_free(tmp_ctx);
@@ -86 +84 @@
                 bcast_addr = socket_address_from_strings(tmp_ctx, bcast_dgmsock->sock->backend_name, 
                                                          iface->bcast_address, 
-                                                         lp_dgram_port(iface->nbtsrv->task->lp_ctx));
+                                                         lpcfg_dgram_port(iface->nbtsrv->task->lp_ctx));
                 if (!bcast_addr) {
                         talloc_free(tmp_ctx);
@@ -96 +94 @@
                         talloc_free(tmp_ctx);
                         DEBUG(0,("Failed to bind to %s:%d - %s\n", 
-                                 iface->bcast_address, lp_dgram_port(iface->nbtsrv->task->lp_ctx), 
+                                 iface->bcast_address, lpcfg_dgram_port(iface->nbtsrv->task->lp_ctx),
                                  nt_errstr(status)));
                         return status;
@@ -105 +103 @@
 
         /* listen for unicasts on port 138 */
-        iface->dgmsock = nbt_dgram_socket_init(iface, nbtsrv->task->event_ctx,
-                                               lp_iconv_convenience(nbtsrv->task->lp_ctx));
+        iface->dgmsock = nbt_dgram_socket_init(iface, nbtsrv->task->event_ctx);
         if (!iface->dgmsock) {
                 talloc_free(tmp_ctx);
@@ -113 +110 @@
 
         bind_addr = socket_address_from_strings(tmp_ctx, iface->dgmsock->sock->backend_name, 
-                                                bind_address, lp_dgram_port(iface->nbtsrv->task->lp_ctx));
+                                                bind_address, lpcfg_dgram_port(iface->nbtsrv->task->lp_ctx));
         if (!bind_addr) {
                 talloc_free(tmp_ctx);
@@ -123 +120 @@
                 talloc_free(tmp_ctx);
                 DEBUG(0,("Failed to bind to %s:%d - %s\n", 
-                         bind_address, lp_dgram_port(iface->nbtsrv->task->lp_ctx), nt_errstr(status)));
+                         bind_address, lpcfg_dgram_port(iface->nbtsrv->task->lp_ctx), nt_errstr(status)));
                 return status;
         }