From c287351d0553dec62f1929f46e3c34278317b2a4 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 15 Mar 2011 17:40:39 +0100 Subject: s4-rap: remove last iconv_convenience traces from rap client and test code. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Guenther Autobuild-User: Günther Deschner Autobuild-Date: Tue Mar 15 22:01:51 CET 2011 on sn-devel-104 --- source4/libcli/rap/rap.c | 3 --- source4/torture/rap/sam.c | 7 +++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/source4/libcli/rap/rap.c b/source4/libcli/rap/rap.c index f22e65ecf5..7217ac036b 100644 --- a/source4/libcli/rap/rap.c +++ b/source4/libcli/rap/rap.c @@ -25,7 +25,6 @@ #include "../librpc/gen_ndr/ndr_rap.h" #include "libcli/rap/rap.h" #include "librpc/ndr/libndr.h" -#include "param/param.h" struct rap_call *new_rap_cli_call(TALLOC_CTX *mem_ctx, uint16_t callno) { @@ -1227,7 +1226,6 @@ NTSTATUS smbcli_rap_netprintdestgetinfo(struct smbcli_tree *tree, } NTSTATUS smbcli_rap_netuserpasswordset2(struct smbcli_tree *tree, - struct smb_iconv_convenience *iconv_convenience, TALLOC_CTX *mem_ctx, struct rap_NetUserPasswordSet2 *r) { @@ -1282,7 +1280,6 @@ NTSTATUS smbcli_rap_netuserpasswordset2(struct smbcli_tree *tree, } NTSTATUS smbcli_rap_netoemchangepassword(struct smbcli_tree *tree, - struct smb_iconv_convenience *iconv_convenience, TALLOC_CTX *mem_ctx, struct rap_NetOEMChangePassword *r) { diff --git a/source4/torture/rap/sam.c b/source4/torture/rap/sam.c index d184fc201e..6aca1588d2 100644 --- a/source4/torture/rap/sam.c +++ b/source4/torture/rap/sam.c @@ -26,7 +26,6 @@ #include "torture/util.h" #include "libcli/rap/rap.h" #include "torture/rap/proto.h" -#include "param/param.h" #include "../lib/crypto/crypto.h" #include "../libcli/auth/libcli_auth.h" #include "torture/rpc/torture_rpc.h" @@ -61,7 +60,7 @@ static bool test_userpasswordset2_args(struct torture_context *tctx, torture_comment(tctx, "Testing rap_NetUserPasswordSet2(%s)\n", r.in.UserName); torture_assert_ntstatus_ok(tctx, - smbcli_rap_netuserpasswordset2(cli->tree, lpcfg_iconv_convenience(tctx->lp_ctx), tctx, &r), + smbcli_rap_netuserpasswordset2(cli->tree, tctx, &r), "smbcli_rap_netuserpasswordset2 failed"); if (!W_ERROR_IS_OK(W_ERROR(r.out.status))) { torture_warning(tctx, "RAP NetUserPasswordSet2 gave: %s\n", @@ -92,7 +91,7 @@ static bool test_userpasswordset2_crypt_args(struct torture_context *tctx, torture_comment(tctx, "Testing rap_NetUserPasswordSet2(%s)\n", r.in.UserName); torture_assert_ntstatus_ok(tctx, - smbcli_rap_netuserpasswordset2(cli->tree, lpcfg_iconv_convenience(tctx->lp_ctx), tctx, &r), + smbcli_rap_netuserpasswordset2(cli->tree, tctx, &r), "smbcli_rap_netuserpasswordset2 failed"); if (!W_ERROR_IS_OK(W_ERROR(r.out.status))) { torture_warning(tctx, "RAP NetUserPasswordSet2 gave: %s\n", @@ -151,7 +150,7 @@ static bool test_oemchangepassword_args(struct torture_context *tctx, torture_comment(tctx, "Testing rap_NetOEMChangePassword(%s)\n", r.in.UserName); torture_assert_ntstatus_ok(tctx, - smbcli_rap_netoemchangepassword(cli->tree, lpcfg_iconv_convenience(tctx->lp_ctx), tctx, &r), + smbcli_rap_netoemchangepassword(cli->tree, tctx, &r), "smbcli_rap_netoemchangepassword failed"); if (!W_ERROR_IS_OK(W_ERROR(r.out.status))) { torture_warning(tctx, "RAP NetOEMChangePassword gave: %s\n", -- cgit