Finish removal of iconv_convenience in public API's.

[bbaumbach/samba-autobuild/.git] / source4 / nbt_server / dgram / request.c

diff --git a/source4/nbt_server/dgram/request.c b/source4/nbt_server/dgram/request.c
index 205a5442092adea2eefec67eb02a38a5e0f8d656..4a3bd133685558ca653465085b284cf7d326a6a7 100644 (file)
--- a/source4/nbt_server/dgram/request.c
+++ b/source4/nbt_server/dgram/request.c
@@ -35,8 +35,10 @@ static const struct {
        const char *mailslot_name;
        dgram_mailslot_handler_t handler;
 } mailslot_handlers[] = {
+       /* Handle both NTLOGON and NETLOGON in the same function, as
+        * they are very similar */
        { NBT_MAILSLOT_NETLOGON, nbtd_mailslot_netlogon_handler },
-       { NBT_MAILSLOT_NTLOGON,  nbtd_mailslot_ntlogon_handler },
+       { NBT_MAILSLOT_NTLOGON,  nbtd_mailslot_netlogon_handler },
        { NBT_MAILSLOT_BROWSE,   nbtd_mailslot_browse_handler }
 };
 
@@ -73,9 +75,7 @@ NTSTATUS nbtd_dgram_setup(struct nbtd_interface *iface, const char *bind_address
 
        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);
                        return NT_STATUS_NO_MEMORY;
@@ -102,8 +102,7 @@ NTSTATUS nbtd_dgram_setup(struct nbtd_interface *iface, const char *bind_address
        }
 
        /* 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);
                return NT_STATUS_NO_MEMORY;