s3: Remove use of iconv_convenience.

5 files changed, 13 insertions, 20 deletions

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 436556344b..e69a9539bc 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -261,7 +261,7 @@ static bool get_ea_dos_attribute(connection_struct *conn,
 	blob.data = (uint8_t *)attrstr;
 	blob.length = sizeret;
 
-	ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), NULL, &dosattrib,
+	ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), &dosattrib,
 			(ndr_pull_flags_fn_t)ndr_pull_xattr_DOSATTRIB);
 
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -378,7 +378,7 @@ static bool set_ea_dos_attribute(connection_struct *conn,
 		smb_fname_str_dbg(smb_fname) ));
 
 	ndr_err = ndr_push_struct_blob(
-			&blob, talloc_tos(), NULL, &dosattrib,
+			&blob, talloc_tos(), &dosattrib,
 			(ndr_push_flags_fn_t)ndr_push_xattr_DOSATTRIB);
 
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index 020cb58a5c..c559c1f53e 100644
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -212,7 +212,7 @@ static NTSTATUS notify_load(struct notify_context *notify, struct db_record *rec
 	status = NT_STATUS_OK;
 	if (blob.length > 0) {
 		enum ndr_err_code ndr_err;
-		ndr_err = ndr_pull_struct_blob(&blob, notify->array, NULL, notify->array,
+		ndr_err = ndr_pull_struct_blob(&blob, notify->array, notify->array,
 					       (ndr_pull_flags_fn_t)ndr_pull_notify_array);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			/* 1. log that we got a corrupt notify_array
@@ -275,7 +275,7 @@ static NTSTATUS notify_save(struct notify_context *notify, struct db_record *rec
 	tmp_ctx = talloc_new(notify);
 	NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
 
-	ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, NULL, notify->array,
+	ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, notify->array,
 				      (ndr_push_flags_fn_t)ndr_push_notify_array);
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		talloc_free(tmp_ctx);
@@ -313,7 +313,7 @@ static void notify_handler(struct messaging_context *msg_ctx, void *private_data
 		return;
 	}
 
-	ndr_err = ndr_pull_struct_blob(data, tmp_ctx, NULL, &ev,
+	ndr_err = ndr_pull_struct_blob(data, tmp_ctx, &ev,
 				       (ndr_pull_flags_fn_t)ndr_pull_notify_event);
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		talloc_free(tmp_ctx);
@@ -429,8 +429,7 @@ static void notify_add_onelevel(struct notify_context *notify,
 	blob.length = rec->value.dsize;
 
 	if (blob.length > 0) {
-		ndr_err = ndr_pull_struct_blob(
-			&blob, array, NULL, array,
+		ndr_err = ndr_pull_struct_blob(&blob, array, array,
 			(ndr_pull_flags_fn_t)ndr_pull_notify_entry_array);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			DEBUG(10, ("ndr_pull_notify_entry_array failed: %s\n",
@@ -456,8 +455,7 @@ static void notify_add_onelevel(struct notify_context *notify,
 	array->entries[array->num_entries].server = notify->server;
 	array->num_entries += 1;
 
-	ndr_err = ndr_push_struct_blob(
-		&blob, rec, NULL, array,
+	ndr_err = ndr_push_struct_blob(&blob, rec, array,
 		(ndr_push_flags_fn_t)ndr_push_notify_entry_array);
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		DEBUG(10, ("ndr_push_notify_entry_array failed: %s\n",
@@ -609,8 +607,7 @@ NTSTATUS notify_remove_onelevel(struct notify_context *notify,
 	blob.length = rec->value.dsize;
 
 	if (blob.length > 0) {
-		ndr_err = ndr_pull_struct_blob(
-			&blob, array, NULL, array,
+		ndr_err = ndr_pull_struct_blob(&blob, array, array,
 			(ndr_pull_flags_fn_t)ndr_pull_notify_entry_array);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			DEBUG(10, ("ndr_pull_notify_entry_array failed: %s\n",
@@ -646,8 +643,7 @@ NTSTATUS notify_remove_onelevel(struct notify_context *notify,
 		return NT_STATUS_OK;
 	}
 
-	ndr_err = ndr_push_struct_blob(
-		&blob, rec, NULL, array,
+	ndr_err = ndr_push_struct_blob(&blob, rec, array,
 		(ndr_push_flags_fn_t)ndr_push_notify_entry_array);
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		DEBUG(10, ("ndr_push_notify_entry_array failed: %s\n",
@@ -809,7 +805,7 @@ static NTSTATUS notify_send(struct notify_context *notify, struct notify_entry *
 
 	tmp_ctx = talloc_new(notify);
 
-	ndr_err = ndr_push_struct_blob(&data, tmp_ctx, NULL, &ev,
+	ndr_err = ndr_push_struct_blob(&data, tmp_ctx, &ev,
 				       (ndr_push_flags_fn_t)ndr_push_notify_event);
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		talloc_free(tmp_ctx);
@@ -853,8 +849,7 @@ void notify_onelevel(struct notify_context *notify, uint32_t action,
 
 	if (blob.length > 0) {
 		enum ndr_err_code ndr_err;
-		ndr_err = ndr_pull_struct_blob(
-			&blob, array, NULL, array,
+		ndr_err = ndr_pull_struct_blob(&blob, array, array,
 			(ndr_pull_flags_fn_t)ndr_pull_notify_entry_array);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			DEBUG(10, ("ndr_pull_notify_entry_array failed: %s\n",
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 496c38db84..d0c0a30c56 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1809,7 +1809,7 @@ NTSTATUS smbd_do_query_security_desc(connection_struct *conn,
 	    security_info_wanted & DACL_SECURITY_INFORMATION)
 		psd->type |= SEC_DESC_DACL_PRESENT;
 
-	*psd_size = ndr_size_security_descriptor(psd, NULL, 0);
+	*psd_size = ndr_size_security_descriptor(psd, 0);
 
 	DEBUG(3,("smbd_do_query_security_desc: sd_size = %lu.\n",
 		(unsigned long)*psd_size));
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 25e995c3bd..02f83cbbe0 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -566,7 +566,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
 			}
 
 			ndr_err = ndr_pull_struct_blob(&secd->data,
-				sec_desc, NULL, sec_desc,
+				sec_desc, sec_desc,
 				(ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
 			if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 				DEBUG(2,("ndr_pull_security_descriptor failed: %s\n",
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 3fa737f4b7..56d22b37bb 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3381,7 +3381,6 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
 			     i < conn->server_info->ptok->num_sids; ++i) {
 				sid_bytes += ndr_size_dom_sid(
 					&conn->server_info->ptok->user_sids[i],
-					NULL, 
 					0);
 			}
 
@@ -3404,7 +3403,6 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
 			    i < conn->server_info->ptok->num_sids; ++i) {
 				int sid_len = ndr_size_dom_sid(
 					&conn->server_info->ptok->user_sids[i],
-					NULL,
 					0);
 
 				sid_linearize(pdata + data_len, sid_len,