Changeset 745 for trunk/server/source4/nbt_server/interfaces.c

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/interfaces.c (modified) (9 diffs)

trunk/server/source4/nbt_server/interfaces.c

@@ -30 +30 @@
 #include "lib/socket/netif.h"
 #include "param/param.h"
+#include "lib/util/util_net.h"
 
 
@@ -186 +187 @@
 
                 /* listen for broadcasts on port 137 */
-                bcast_nbtsock = nbt_name_socket_init(iface, nbtsrv->task->event_ctx, lp_iconv_convenience(nbtsrv->task->lp_ctx));
+                bcast_nbtsock = nbt_name_socket_init(iface, nbtsrv->task->event_ctx);
                 if (!bcast_nbtsock) {
                         talloc_free(iface);
@@ -193 +194 @@
 
                 bcast_address = socket_address_from_strings(bcast_nbtsock, bcast_nbtsock->sock->backend_name, 
-                                                            bcast, lp_nbt_port(lp_ctx));
+                                                            bcast, lpcfg_nbt_port(lp_ctx));
                 if (!bcast_address) {
                         talloc_free(iface);
@@ -202 +203 @@
                 if (!NT_STATUS_IS_OK(status)) {
                         DEBUG(0,("Failed to bind to %s:%d - %s\n", 
-                                 bcast, lp_nbt_port(lp_ctx), nt_errstr(status)));
+                                 bcast, lpcfg_nbt_port(lp_ctx), nt_errstr(status)));
                         talloc_free(iface);
                         return status;
@@ -212 +213 @@
 
         /* listen for unicasts on port 137 */
-        iface->nbtsock = nbt_name_socket_init(iface, nbtsrv->task->event_ctx, 
-                                              lp_iconv_convenience(nbtsrv->task->lp_ctx));
+        iface->nbtsock = nbt_name_socket_init(iface, nbtsrv->task->event_ctx);
         if (!iface->nbtsock) {
                 talloc_free(iface);
@@ -221 +221 @@
         unicast_address = socket_address_from_strings(iface->nbtsock, 
                                                       iface->nbtsock->sock->backend_name, 
-                                                      bind_address, lp_nbt_port(lp_ctx));
+                                                      bind_address, lpcfg_nbt_port(lp_ctx));
 
         status = socket_listen(iface->nbtsock->sock, unicast_address, 0, 0);
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0,("Failed to bind to %s:%d - %s\n", 
-                         bind_address, lp_nbt_port(lp_ctx), nt_errstr(status)));
+                         bind_address, lpcfg_nbt_port(lp_ctx), nt_errstr(status)));
                 talloc_free(iface);
                 return status;
@@ -284 +284 @@
         /* if we are allowing incoming packets from any address, then
            we also need to bind to the wildcard address */
-        if (!lp_bind_interfaces_only(lp_ctx)) {
+        if (!lpcfg_bind_interfaces_only(lp_ctx)) {
                 const char *primary_address;
 
@@ -294 +294 @@
                 } else {
                         primary_address = inet_ntoa(interpret_addr2(
-                                                        lp_netbios_name(lp_ctx)));
+                                                        lpcfg_netbios_name(lp_ctx)));
                 }
                 primary_address = talloc_strdup(tmp_ctx, primary_address);
@@ -319 +319 @@
                 netmask = talloc_strdup(tmp_ctx, iface_n_netmask(ifaces, i));
 
-                status = nbtd_add_socket(nbtsrv, lp_ctx, 
+                status = nbtd_add_socket(nbtsrv, lp_ctx,
                                          address, address, bcast, netmask);
                 NT_STATUS_NOT_OK_RETURN(status);
         }
 
-        if (lp_wins_server_list(lp_ctx)) {
+        if (lpcfg_wins_server_list(lp_ctx)) {
                 status = nbtd_add_wins_socket(nbtsrv);
                 NT_STATUS_NOT_OK_RETURN(status);