From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Wed, 17 May 2023 03:49:09 +0000 (+1200)
Subject: s4:kdc: Remove manual addition of error data
X-Git-Tag: talloc-2.4.1~618
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e176d856fea22973efe6db3ebea3b1fce36d87f;p=thirdparty%2Fsamba.git

s4:kdc: Remove manual addition of error data

This is now handled by the hdb_samba4_set_ntstatus() call above.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
index 872f7e0dc9d..c1cdd0a8f00 100644
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -646,25 +646,6 @@ static char *get_netbios_name(TALLOC_CTX *mem_ctx, HostAddresses *addrs)
 	return nb_name;
 }
 
-/* this function allocates 'data' using malloc.
- * The caller is responsible for freeing it */
-static void samba_kdc_build_edata_reply(NTSTATUS nt_status, krb5_data *e_data)
-{
-	e_data->data = malloc(12);
-	if (e_data->data == NULL) {
-		e_data->length = 0;
-		e_data->data = NULL;
-		return;
-	}
-	e_data->length = 12;
-
-	SIVAL(e_data->data, 0, NT_STATUS_V(nt_status));
-	SIVAL(e_data->data, 4, 0);
-	SIVAL(e_data->data, 8, 1);
-
-	return;
-}
-
 static krb5_error_code samba_wdc_check_client_access(void *priv,
 						     astgs_request_t r)
 {
@@ -703,24 +684,6 @@ static krb5_error_code samba_wdc_check_client_access(void *priv,
 			ret = ret2;
 		}
 
-		if (kdc_request_get_rep(r)->padata) {
-			krb5_data kd;
-
-			samba_kdc_build_edata_reply(nt_status, &kd);
-			ret2 = krb5_padata_add(kdc_request_get_context((kdc_request_t)r), kdc_request_get_rep(r)->padata,
-					       KRB5_PADATA_PW_SALT,
-					       kd.data, kd.length);
-			if (ret2) {
-				/*
-				 * So we do not leak the allocated
-				 * memory on kd in the error case
-				 */
-				krb5_data_free(&kd);
-
-				ret = ret2;
-			}
-		}
-
 		return ret;
 	}