Finish removal of iconv_convenience in public API's.

6 files changed, 10 insertions, 15 deletions

diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index f5e81cd6f69..7a3993c79bf 100644
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -75,8 +75,7 @@ static NTSTATUS smbcli_transport_finish_recv(void *private_data, DATA_BLOB blob)
 struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock,
 					       TALLOC_CTX *parent_ctx, 
 					       bool primary, 
-					       struct smbcli_options *options,
-						   struct smb_iconv_convenience *iconv_convenience)
+					       struct smbcli_options *options)
 {
 	struct smbcli_transport *transport;
 
@@ -91,7 +90,6 @@ struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock,
 	transport->negotiate.protocol = PROTOCOL_NT1;
 	transport->options = *options;
 	transport->negotiate.max_xmit = transport->options.max_xmit;
-	transport->iconv_convenience = iconv_convenience;
 
 	/* setup the stream -> packet parser */
 	transport->packet = packet_init(transport);
@@ -172,10 +170,10 @@ struct smbcli_request *smbcli_transport_connect_send(struct smbcli_transport *tr
 	status = nbt_name_dup(transport, called, &transport->called);
 	if (!NT_STATUS_IS_OK(status)) goto failed;
 	
-	status = nbt_name_to_blob(tmp_ctx, transport->iconv_convenience, &calling_blob, calling);
+	status = nbt_name_to_blob(tmp_ctx, &calling_blob, calling);
 	if (!NT_STATUS_IS_OK(status)) goto failed;
 
-	status = nbt_name_to_blob(tmp_ctx, transport->iconv_convenience, &called_blob, called);
+	status = nbt_name_to_blob(tmp_ctx, &called_blob, called);
 	if (!NT_STATUS_IS_OK(status)) goto failed;
 
   	/* allocate output buffer */
diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index a083396f350..cee1cd0bf04 100644
--- a/source4/libcli/raw/clitree.c
+++ b/source4/libcli/raw/clitree.c
@@ -179,7 +179,6 @@ NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
 				     struct tevent_context *ev,
 				     struct smbcli_options *options,
 				     struct smbcli_session_options *session_options,
-					 struct smb_iconv_convenience *iconv_convenience,
 					 struct gensec_settings *gensec_settings)
 {
 	struct smb_composite_connect io;
@@ -205,7 +204,6 @@ NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
 	io.in.workgroup = "";
 	io.in.options = *options;
 	io.in.session_options = *session_options;
-	io.in.iconv_convenience = iconv_convenience;
 	
 	status = smb_composite_connect(&io, parent_ctx, resolve_ctx, ev);
 	if (NT_STATUS_IS_OK(status)) {
diff --git a/source4/libcli/raw/rawacl.c b/source4/libcli/raw/rawacl.c
index e13ba85361d..c2de2cc7d22 100644
--- a/source4/libcli/raw/rawacl.c
+++ b/source4/libcli/raw/rawacl.c
@@ -77,7 +77,7 @@ NTSTATUS smb_raw_query_secdesc_recv(struct smbcli_request *req,
 
 	nt.out.data.length = IVAL(nt.out.params.data, 0);
 
-	ndr = ndr_pull_init_blob(&nt.out.data, mem_ctx, NULL);
+	ndr = ndr_pull_init_blob(&nt.out.data, mem_ctx);
 	if (!ndr) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
@@ -135,7 +135,7 @@ struct smbcli_request *smb_raw_set_secdesc_send(struct smbcli_tree *tree,
 	nt.in.params.data = params;
 	nt.in.params.length = 8;
 
-	ndr = ndr_push_init_ctx(NULL, NULL);
+	ndr = ndr_push_init_ctx(NULL);
 	if (!ndr) return NULL;
 
 	ndr_err = ndr_push_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, io->set_secdesc.in.sd);
diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c
index 1509c83e00d..5797540edd0 100644
--- a/source4/libcli/raw/rawfile.c
+++ b/source4/libcli/raw/rawfile.c
@@ -348,7 +348,7 @@ static struct smbcli_request *smb_raw_nttrans_create_send(struct smbcli_tree *tr
 
 	if (parms->ntcreatex.in.sec_desc) {
 		enum ndr_err_code ndr_err;
-		ndr_err = ndr_push_struct_blob(&sd_blob, mem_ctx, NULL,
+		ndr_err = ndr_push_struct_blob(&sd_blob, mem_ctx, 
 					       parms->ntcreatex.in.sec_desc,
 					       (ndr_push_flags_fn_t)ndr_push_security_descriptor);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c
index f81a8071d15..08598a2d64d 100644
--- a/source4/libcli/raw/rawfileinfo.c
+++ b/source4/libcli/raw/rawfileinfo.c
@@ -253,9 +253,9 @@ NTSTATUS smb_raw_fileinfo_passthru_parse(const DATA_BLOB *blob, TALLOC_CTX *mem_
 		parms->query_secdesc.out.sd = talloc(mem_ctx, struct security_descriptor);
 		NT_STATUS_HAVE_NO_MEMORY(parms->query_secdesc.out.sd);
 
-		ndr_err = ndr_pull_struct_blob(blob, mem_ctx, NULL, 
-					       parms->query_secdesc.out.sd,
-					       (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
+		ndr_err = ndr_pull_struct_blob(blob, mem_ctx,
+			parms->query_secdesc.out.sd,
+			(ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			return ndr_map_error2ntstatus(ndr_err);
 		}
diff --git a/source4/libcli/raw/rawsetfileinfo.c b/source4/libcli/raw/rawsetfileinfo.c
index 892d5e483b0..6ad3e9ee8d9 100644
--- a/source4/libcli/raw/rawsetfileinfo.c
+++ b/source4/libcli/raw/rawsetfileinfo.c
@@ -99,8 +99,7 @@ bool smb_raw_setfileinfo_passthru(TALLOC_CTX *mem_ctx,
 	case RAW_FILEINFO_SEC_DESC: {
 		enum ndr_err_code ndr_err;
 
-		ndr_err = ndr_push_struct_blob(blob, mem_ctx, NULL,
-					       parms->set_secdesc.in.sd,
+		ndr_err = ndr_push_struct_blob(blob, mem_ctx, parms->set_secdesc.in.sd,
 					       (ndr_push_flags_fn_t)ndr_push_security_descriptor);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			return false;