krb5_wrap: Rename kerberos_free_data_contents()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

6 files changed, 34 insertions, 34 deletions

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 013efbffa08..5884607799e 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -523,7 +523,7 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
 			}
 			if (ret) {
 				if (key.salt) {
-					kerberos_free_data_contents(context, &key.salt->salt);
+					smb_krb5_free_data_contents(context, &key.salt->salt);
 					free(key.salt);
 					key.salt = NULL;
 				}
@@ -573,7 +573,7 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
 							      &key.key);
 			if (ret) {
 				if (key.salt) {
-					kerberos_free_data_contents(context, &key.salt->salt);
+					smb_krb5_free_data_contents(context, &key.salt->salt);
 					free(key.salt);
 					key.salt = NULL;
 				}
@@ -1367,7 +1367,7 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
 							      ENCTYPE_AES256_CTS_HMAC_SHA1_96,
 							      &key.key);
 			if (ret != 0) {
-				kerberos_free_data_contents(context, &salt);
+				smb_krb5_free_data_contents(context, &salt);
 				goto out;
 			}
 
@@ -1383,7 +1383,7 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
 							      ENCTYPE_AES128_CTS_HMAC_SHA1_96,
 							      &key.key);
 			if (ret != 0) {
-				kerberos_free_data_contents(context, &salt);
+				smb_krb5_free_data_contents(context, &salt);
 				goto out;
 			}
 
@@ -1391,7 +1391,7 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
 			entry_ex->entry.keys.len++;
 		}
 
-		kerberos_free_data_contents(context, &salt);
+		smb_krb5_free_data_contents(context, &salt);
 	}
 
 	if (password_hash != NULL) {
diff --git a/source4/kdc/kdc-server.c b/source4/kdc/kdc-server.c
index 5b8463bb700..7854f497b05 100644
--- a/source4/kdc/kdc-server.c
+++ b/source4/kdc/kdc-server.c
@@ -90,7 +90,7 @@ static NTSTATUS kdc_proxy_unavailable_error(struct kdc_server *kdc,
 	}
 
 	*out = data_blob_talloc(mem_ctx, enc_error.data, enc_error.length);
-	kerberos_free_data_contents(kdc->smb_krb5_context->krb5_context,
+	smb_krb5_free_data_contents(kdc->smb_krb5_context->krb5_context,
 				    &enc_error);
 	if (!out->data) {
 		return NT_STATUS_NO_MEMORY;
diff --git a/source4/kdc/kpasswd-heimdal.c b/source4/kdc/kpasswd-heimdal.c
index e61dfd42a16..ff2f6af9208 100644
--- a/source4/kdc/kpasswd-heimdal.c
+++ b/source4/kdc/kpasswd-heimdal.c
@@ -86,7 +86,7 @@ static bool kpasswdd_make_unauth_error_reply(struct kdc_server *kdc,
 		return false;
 	}
 	*error_blob = data_blob_talloc(mem_ctx, k5_error_blob.data, k5_error_blob.length);
-	kerberos_free_data_contents(kdc->smb_krb5_context->krb5_context,
+	smb_krb5_free_data_contents(kdc->smb_krb5_context->krb5_context,
 				    &k5_error_blob);
 	if (!error_blob->data) {
 		return false;
diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index ad72e2e7b3a..b232f6a29f0 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -445,7 +445,7 @@ krb5_error_code samba_make_krb5_pac(krb5_context context,
 					      cred_blob->data,
 					      cred_blob->length);
 		if (ret != 0) {
-			kerberos_free_data_contents(context, &logon_data);
+			smb_krb5_free_data_contents(context, &logon_data);
 			return ret;
 		}
 	}
@@ -456,8 +456,8 @@ krb5_error_code samba_make_krb5_pac(krb5_context context,
 					      upn_blob->data,
 					      upn_blob->length);
 		if (ret != 0) {
-			kerberos_free_data_contents(context, &logon_data);
-			kerberos_free_data_contents(context, &cred_data);
+			smb_krb5_free_data_contents(context, &logon_data);
+			smb_krb5_free_data_contents(context, &cred_data);
 			return ret;
 		}
 	}
@@ -468,28 +468,28 @@ krb5_error_code samba_make_krb5_pac(krb5_context context,
 					      deleg_blob->data,
 					      deleg_blob->length);
 		if (ret != 0) {
-			kerberos_free_data_contents(context, &logon_data);
-			kerberos_free_data_contents(context, &cred_data);
-			kerberos_free_data_contents(context, &upn_data);
+			smb_krb5_free_data_contents(context, &logon_data);
+			smb_krb5_free_data_contents(context, &cred_data);
+			smb_krb5_free_data_contents(context, &upn_data);
 			return ret;
 		}
 	}
 
 	ret = krb5_pac_init(context, pac);
 	if (ret != 0) {
-		kerberos_free_data_contents(context, &logon_data);
-		kerberos_free_data_contents(context, &cred_data);
-		kerberos_free_data_contents(context, &upn_data);
-		kerberos_free_data_contents(context, &deleg_data);
+		smb_krb5_free_data_contents(context, &logon_data);
+		smb_krb5_free_data_contents(context, &cred_data);
+		smb_krb5_free_data_contents(context, &upn_data);
+		smb_krb5_free_data_contents(context, &deleg_data);
 		return ret;
 	}
 
 	ret = krb5_pac_add_buffer(context, *pac, PAC_TYPE_LOGON_INFO, &logon_data);
-	kerberos_free_data_contents(context, &logon_data);
+	smb_krb5_free_data_contents(context, &logon_data);
 	if (ret != 0) {
-		kerberos_free_data_contents(context, &upn_data);
-		kerberos_free_data_contents(context, &cred_data);
-		kerberos_free_data_contents(context, &deleg_data);
+		smb_krb5_free_data_contents(context, &upn_data);
+		smb_krb5_free_data_contents(context, &cred_data);
+		smb_krb5_free_data_contents(context, &deleg_data);
 		return ret;
 	}
 
@@ -497,10 +497,10 @@ krb5_error_code samba_make_krb5_pac(krb5_context context,
 		ret = krb5_pac_add_buffer(context, *pac,
 					  PAC_TYPE_CREDENTIAL_INFO,
 					  &cred_data);
-		kerberos_free_data_contents(context, &cred_data);
+		smb_krb5_free_data_contents(context, &cred_data);
 		if (ret != 0) {
-			kerberos_free_data_contents(context, &upn_data);
-			kerberos_free_data_contents(context, &deleg_data);
+			smb_krb5_free_data_contents(context, &upn_data);
+			smb_krb5_free_data_contents(context, &deleg_data);
 			return ret;
 		}
 	}
@@ -514,8 +514,8 @@ krb5_error_code samba_make_krb5_pac(krb5_context context,
 				  PAC_TYPE_LOGON_NAME,
 				  &null_data);
 	if (ret != 0) {
-		kerberos_free_data_contents(context, &upn_data);
-		kerberos_free_data_contents(context, &deleg_data);
+		smb_krb5_free_data_contents(context, &upn_data);
+		smb_krb5_free_data_contents(context, &deleg_data);
 		return ret;
 	}
 
@@ -523,9 +523,9 @@ krb5_error_code samba_make_krb5_pac(krb5_context context,
 		ret = krb5_pac_add_buffer(context, *pac,
 					  PAC_TYPE_UPN_DNS_INFO,
 					  &upn_data);
-		kerberos_free_data_contents(context, &upn_data);
+		smb_krb5_free_data_contents(context, &upn_data);
 		if (ret != 0) {
-			kerberos_free_data_contents(context, &deleg_data);
+			smb_krb5_free_data_contents(context, &deleg_data);
 			return ret;
 		}
 	}
@@ -534,7 +534,7 @@ krb5_error_code samba_make_krb5_pac(krb5_context context,
 		ret = krb5_pac_add_buffer(context, *pac,
 					  PAC_TYPE_CONSTRAINED_DELEGATION,
 					  &deleg_data);
-		kerberos_free_data_contents(context, &deleg_data);
+		smb_krb5_free_data_contents(context, &deleg_data);
 		if (ret != 0) {
 			return ret;
 		}
@@ -803,7 +803,7 @@ NTSTATUS samba_kdc_update_delegation_info_blob(TALLOC_CTX *mem_ctx,
 				&info, PAC_TYPE_CONSTRAINED_DELEGATION,
 				(ndr_pull_flags_fn_t)ndr_pull_PAC_INFO);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-			kerberos_free_data_contents(context, &old_data);
+			smb_krb5_free_data_contents(context, &old_data);
 			nt_status = ndr_map_error2ntstatus(ndr_err);
 			DEBUG(0,("can't parse the PAC LOGON_INFO: %s\n", nt_errstr(nt_status)));
 			talloc_free(tmp_ctx);
@@ -813,7 +813,7 @@ NTSTATUS samba_kdc_update_delegation_info_blob(TALLOC_CTX *mem_ctx,
 		ZERO_STRUCT(_d);
 		info.constrained_delegation.info = &_d;
 	}
-	kerberos_free_data_contents(context, &old_data);
+	smb_krb5_free_data_contents(context, &old_data);
 
 	ret = krb5_unparse_name(context, server_principal, &server);
 	if (ret) {
@@ -843,7 +843,7 @@ NTSTATUS samba_kdc_update_delegation_info_blob(TALLOC_CTX *mem_ctx,
 	SAFE_FREE(server);
 	SAFE_FREE(proxy);
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		kerberos_free_data_contents(context, &old_data);
+		smb_krb5_free_data_contents(context, &old_data);
 		nt_status = ndr_map_error2ntstatus(ndr_err);
 		DEBUG(0,("can't parse the PAC LOGON_INFO: %s\n", nt_errstr(nt_status)));
 		talloc_free(tmp_ctx);
diff --git a/source4/kdc/sdb.c b/source4/kdc/sdb.c
index d7c99520678..ca6b38d1a32 100644
--- a/source4/kdc/sdb.c
+++ b/source4/kdc/sdb.c
@@ -62,7 +62,7 @@ static void free_sdb_key(struct sdb_key *k)
 	/* keyblock not alloced */
 
 	if (k->salt) {
-		kerberos_free_data_contents(NULL, &k->salt->salt);
+		smb_krb5_free_data_contents(NULL, &k->salt->salt);
 	}
 
 	ZERO_STRUCTP(k);
diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
index fddf342787f..0b1573472c6 100644
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -451,7 +451,7 @@ static krb5_error_code samba_wdc_reget_pac(void *priv, krb5_context context,
 
 		ret = krb5_pac_add_buffer(context, new_pac,
 					  type, &type_data);
-		kerberos_free_data_contents(context, &type_data);
+		smb_krb5_free_data_contents(context, &type_data);
 		if (ret != 0) {
 			SAFE_FREE(types);
 			krb5_pac_free(context, new_pac);