From f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 9 May 2010 17:20:01 +0200 Subject: Finish removal of iconv_convenience in public API's. --- source4/nbt_server/dgram/request.c | 7 ++----- source4/nbt_server/interfaces.c | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'source4/nbt_server') diff --git a/source4/nbt_server/dgram/request.c b/source4/nbt_server/dgram/request.c index 277b64741d..4a3bd13368 100644 --- a/source4/nbt_server/dgram/request.c +++ b/source4/nbt_server/dgram/request.c @@ -75,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; @@ -104,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; diff --git a/source4/nbt_server/interfaces.c b/source4/nbt_server/interfaces.c index 99c5886fd9..19639dd167 100644 --- a/source4/nbt_server/interfaces.c +++ b/source4/nbt_server/interfaces.c @@ -186,7 +186,7 @@ static NTSTATUS nbtd_add_socket(struct nbtd_server *nbtsrv, struct nbt_name_socket *bcast_nbtsock; /* 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); return NT_STATUS_NO_MEMORY; @@ -212,8 +212,7 @@ static NTSTATUS nbtd_add_socket(struct nbtd_server *nbtsrv, } /* 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); return NT_STATUS_NO_MEMORY; -- cgit