Finish removal of iconv_convenience in public API's.

3 files changed, 10 insertions, 17 deletions

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 33c4c8cdf6..97820c0c32 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -192,7 +192,6 @@ static void samba_kdc_free_entry(krb5_context context, hdb_entry_ex *entry_ex)
 }
 
 static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
-					      struct smb_iconv_convenience *iconv_convenience,
 					      TALLOC_CTX *mem_ctx,
 					      struct ldb_message *msg,
 					      unsigned int userAccountControl,
@@ -228,7 +227,7 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
 
 	/* supplementalCredentials if present */
 	if (sc_val) {
-		ndr_err = ndr_pull_struct_blob_all(sc_val, mem_ctx, iconv_convenience, &scb,
+		ndr_err = ndr_pull_struct_blob_all(sc_val, mem_ctx, &scb,
 						   (ndr_pull_flags_fn_t)ndr_pull_supplementalCredentialsBlob);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			dump_data(0, sc_val->data, sc_val->length);
@@ -277,7 +276,7 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
 		}
 
 		/* we cannot use ndr_pull_struct_blob_all() here, as w2k and w2k3 add padding bytes */
-		ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, iconv_convenience, &_pkb,
+		ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, &_pkb,
 					       (ndr_pull_flags_fn_t)ndr_pull_package_PrimaryKerberosBlob);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			ret = EINVAL;
@@ -701,8 +700,8 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context,
 	entry_ex->entry.generation = NULL;
 
 	/* Get keys from the db */
-	ret = samba_kdc_message2entry_keys(context, p->kdc_db_ctx->ic_ctx, p,
-					    msg, userAccountControl, entry_ex);
+	ret = samba_kdc_message2entry_keys(context, p, msg, userAccountControl,
+									   entry_ex);
 	if (ret) {
 		/* Could be bougus data in the entry, or out of memory */
 		goto out;
@@ -808,7 +807,7 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
 		goto out;
 	}
 
-	ndr_err = ndr_pull_struct_blob(password_val, mem_ctx, p->kdc_db_ctx->ic_ctx, &password_blob,
+	ndr_err = ndr_pull_struct_blob(password_val, mem_ctx, &password_blob,
 					   (ndr_pull_flags_fn_t)ndr_pull_trustAuthInOutBlob);
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		ret = EINVAL;
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 984999b83c..b824bb86b0 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -589,9 +589,7 @@ static NTSTATUS kdc_check_generic_kerberos(struct irpc_message *msg,
 	/* There is no reply to this request */
 	r->out.generic_reply = data_blob(NULL, 0);
 
-	ndr_err = ndr_pull_struct_blob(&r->in.generic_request, msg,
-				       lp_iconv_convenience(kdc->task->lp_ctx),
-				       &pac_validate,
+	ndr_err = ndr_pull_struct_blob(&r->in.generic_request, msg, &pac_validate,
 				       (ndr_pull_flags_fn_t)ndr_pull_PAC_Validate);
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		return NT_STATUS_INVALID_PARAMETER;
diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 2a932fa832..8c203e555d 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -34,7 +34,6 @@
 
 static
 NTSTATUS samba_get_logon_info_pac_blob(TALLOC_CTX *mem_ctx,
-				       struct smb_iconv_convenience *ic,
 				       struct auth_serversupplied_info *info,
 				       DATA_BLOB *pac_data)
 {
@@ -59,7 +58,7 @@ NTSTATUS samba_get_logon_info_pac_blob(TALLOC_CTX *mem_ctx,
 
 	pac_info.logon_info.info->info3 = *info3;
 
-	ndr_err = ndr_push_union_blob(pac_data, mem_ctx, ic, &pac_info,
+	ndr_err = ndr_push_union_blob(pac_data, mem_ctx, &pac_info,
 				      PAC_TYPE_LOGON_INFO,
 				      (ndr_push_flags_fn_t)ndr_push_PAC_INFO);
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -154,9 +153,7 @@ NTSTATUS samba_kdc_get_pac_blob(TALLOC_CTX *mem_ctx,
 		return nt_status;
 	}
 
-	nt_status = samba_get_logon_info_pac_blob(mem_ctx,
-						  p->kdc_db_ctx->ic_ctx,
-						  server_info, pac_blob);
+	nt_status = samba_get_logon_info_pac_blob(mem_ctx, server_info, pac_blob);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DEBUG(0, ("Building PAC failed: %s\n",
 			  nt_errstr(nt_status)));
@@ -169,20 +166,19 @@ NTSTATUS samba_kdc_get_pac_blob(TALLOC_CTX *mem_ctx,
 
 NTSTATUS samba_kdc_update_pac_blob(TALLOC_CTX *mem_ctx,
 				   krb5_context context,
-				   struct smb_iconv_convenience *ic,
 				   krb5_pac *pac, DATA_BLOB *pac_blob)
 {
 	struct auth_serversupplied_info *server_info;
 	krb5_error_code ret;
 	NTSTATUS nt_status;
 
-	ret = kerberos_pac_to_server_info(mem_ctx, ic, *pac,
+	ret = kerberos_pac_to_server_info(mem_ctx, *pac,
 					  context, &server_info);
 	if (ret) {
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
-	nt_status = samba_get_logon_info_pac_blob(mem_ctx, ic,
+	nt_status = samba_get_logon_info_pac_blob(mem_ctx, 
 						  server_info, pac_blob);
 
 	return nt_status;