Finish removal of iconv_convenience in public API's.

4 files changed, 2 insertions, 18 deletions

diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c
index 302d470afd..b804a15d1c 100644
--- a/source4/client/cifsdd.c
+++ b/source4/client/cifsdd.c
@@ -360,7 +360,6 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx,
 				      struct smbcli_options *smb_options,
 				      const char *socket_options,
 				      struct smbcli_session_options *smb_session_options,
-				      struct smb_iconv_convenience *iconv_convenience,
 				      struct gensec_settings *gensec_settings)
 {
 	int			options = 0;
@@ -385,7 +384,6 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx,
 				      check_arg_numeric("ibs"), options,
 				      socket_options,
 				      smb_options, smb_session_options,
-				      iconv_convenience,
 				      gensec_settings);
 	} else if (strcmp(which, "of") == 0) {
 		options |= DD_WRITE;
@@ -394,7 +392,6 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx,
 				      check_arg_numeric("obs"), options,
 				      socket_options,
 				      smb_options, smb_session_options,
-				      iconv_convenience,
 				      gensec_settings);
 	} else {
 		SMB_ASSERT(0);
@@ -450,7 +447,7 @@ static int copy_files(struct tevent_context *ev, struct loadparm_context *lp_ctx
 	if (!(ifile = open_file(lp_resolve_context(lp_ctx), ev, "if",
 				lp_smb_ports(lp_ctx), &options,
 				lp_socket_options(lp_ctx),
-				&session_options, lp_iconv_convenience(lp_ctx),
+				&session_options, 
 				lp_gensec_settings(lp_ctx, lp_ctx)))) {
 		return(FILESYS_EXIT_CODE);
 	}
@@ -459,7 +456,6 @@ static int copy_files(struct tevent_context *ev, struct loadparm_context *lp_ctx
 				lp_smb_ports(lp_ctx), &options,
 				lp_socket_options(lp_ctx),
 				&session_options,
-				lp_iconv_convenience(lp_ctx),
 				lp_gensec_settings(lp_ctx, lp_ctx)))) {
 		return(FILESYS_EXIT_CODE);
 	}
diff --git a/source4/client/cifsdd.h b/source4/client/cifsdd.h
index e39c046fe8..4e9cb9dd9a 100644
--- a/source4/client/cifsdd.h
+++ b/source4/client/cifsdd.h
@@ -100,7 +100,6 @@ struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx,
 				const char *socket_options,
 				struct smbcli_options *smb_options,
 				struct smbcli_session_options *smb_session_options,
-				struct smb_iconv_convenience *iconv_convenience,
 				struct gensec_settings *gensec_settings);
 bool dd_fill_block(struct dd_iohandle * h, uint8_t * buf,
 		uint64_t * buf_size, uint64_t need_size, uint64_t block_size);
diff --git a/source4/client/cifsddio.c b/source4/client/cifsddio.c
index 47caf6b835..0ceb69e3b1 100644
--- a/source4/client/cifsddio.c
+++ b/source4/client/cifsddio.c
@@ -227,7 +227,6 @@ static struct smbcli_state * init_smb_session(struct resolve_context *resolve_ct
 					      const char *socket_options,
 					      struct smbcli_options *options,
 					      struct smbcli_session_options *session_options,
-					      struct smb_iconv_convenience *iconv_convenience,
 					      struct gensec_settings *gensec_settings)
 {
 	NTSTATUS		ret;
@@ -242,7 +241,6 @@ static struct smbcli_state * init_smb_session(struct resolve_context *resolve_ct
 				     cmdline_credentials, resolve_ctx,
 				     ev, options,
 				     session_options,
-				     iconv_convenience,
 				     gensec_settings);
 
 	if (!NT_STATUS_IS_OK(ret)) {
@@ -312,7 +310,6 @@ static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx
 					const char *socket_options,
 					struct smbcli_options *smb_options,
 					struct smbcli_session_options *smb_session_options,
-					struct smb_iconv_convenience *iconv_convenience,
 					struct gensec_settings *gensec_settings)
 {
 	struct cifs_handle * smbh;
@@ -336,7 +333,6 @@ static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx
 	if ((smbh->cli = init_smb_session(resolve_ctx, ev, host, ports, share,
 					  socket_options,
 					  smb_options, smb_session_options,
-					  iconv_convenience,
 					  gensec_settings)) == NULL) {
 		return(NULL);
 	}
@@ -361,7 +357,6 @@ struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx,
 				const char *socket_options,
 				struct smbcli_options *smb_options,
 				struct smbcli_session_options *smb_session_options,
-				struct smb_iconv_convenience *iconv_convenience,
 				struct gensec_settings *gensec_settings)
 {
 	if (file_exist(path)) {
@@ -382,7 +377,6 @@ struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx,
 						io_size, options, 
 						socket_options, smb_options,
 						smb_session_options,
-						iconv_convenience,
 						gensec_settings));
 		}
 
diff --git a/source4/client/client.c b/source4/client/client.c
index 55a2d0c0d0..cf834b9e1f 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -3055,7 +3055,6 @@ static bool do_connect(struct smbclient_context *ctx,
 		       struct cli_credentials *cred, 
 		       struct smbcli_options *options,
 		       struct smbcli_session_options *session_options,
-			   struct smb_iconv_convenience *iconv_convenience,
 			   struct gensec_settings *gensec_settings)
 {
 	NTSTATUS status;
@@ -3078,7 +3077,6 @@ static bool do_connect(struct smbclient_context *ctx,
 					socket_options,
 					cred, resolve_ctx, 
 					ev_ctx, options, session_options,
-					iconv_convenience,
 					gensec_settings);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("Connection to \\\\%s\\%s failed - %s\n", 
@@ -3113,7 +3111,6 @@ static int do_message_op(const char *netbios_name, const char *desthost,
 			 struct tevent_context *ev_ctx,
 			 struct resolve_context *resolve_ctx,
 			 struct smbcli_options *options,
-			 struct smb_iconv_convenience *iconv_convenience,
              const char *socket_options)
 {
 	struct nbt_name called, calling;
@@ -3129,7 +3126,6 @@ static int do_message_op(const char *netbios_name, const char *desthost,
 	if (!(cli = smbcli_state_init(NULL)) ||
 	    !smbcli_socket_connect(cli, server_name, destports,
 				   ev_ctx, resolve_ctx, options,
-				   iconv_convenience,
                    socket_options)) {
 		d_printf("Connection to %s failed\n", server_name);
 		return 1;
@@ -3283,7 +3279,7 @@ static int do_message_op(const char *netbios_name, const char *desthost,
 				   lp_smb_ports(cmdline_lp_ctx), dest_ip,
 				   name_type, ev_ctx,
 				   lp_resolve_context(cmdline_lp_ctx),
-				   &smb_options, lp_iconv_convenience(cmdline_lp_ctx),
+				   &smb_options, 
                    lp_socket_options(cmdline_lp_ctx));
 		return rc;
 	}
@@ -3292,7 +3288,6 @@ static int do_message_op(const char *netbios_name, const char *desthost,
 			desthost, lp_smb_ports(cmdline_lp_ctx), service,
 			lp_socket_options(cmdline_lp_ctx),
 			cmdline_credentials, &smb_options, &smb_session_options,
-			lp_iconv_convenience(cmdline_lp_ctx),
 			lp_gensec_settings(ctx, cmdline_lp_ctx)))
 		return 1;