From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 29 Oct 2024 17:30:22 +0000 (+0100)
Subject: auth_log: prepare for netr_ServerAuthenticateKerberos
X-Git-Tag: tdb-1.4.13~357
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87b553084db9a57bbf0aa44361e5698a031c9d43;p=thirdparty%2Fsamba.git

auth_log: prepare for netr_ServerAuthenticateKerberos

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/auth/auth_log.c b/auth/auth_log.c
index 9a110fd0b48..a918db4e37f 100644
--- a/auth/auth_log.c
+++ b/auth/auth_log.c
@@ -754,8 +754,10 @@ static const char* get_password_type(const struct auth_usersupplied_info *ui)
 	} else if (ui->auth_description != NULL &&
 		   strncmp("ServerAuthenticate", ui->auth_description, 18) == 0)
 	{
-		if (ui->netlogon_trust_account.negotiate_flags
-		    & NETLOGON_NEG_SUPPORTS_AES) {
+		if (ui->netlogon_trust_account.authenticate_kerberos) {
+			password_type = "Kerberos";
+		} else if (ui->netlogon_trust_account.negotiate_flags
+			   & NETLOGON_NEG_SUPPORTS_AES) {
 			password_type = "HMAC-SHA256";
 		} else if (ui->netlogon_trust_account.negotiate_flags
 		           & NETLOGON_NEG_STRONG_KEYS) {
diff --git a/auth/common_auth.h b/auth/common_auth.h
index 1afb79eb5df..ef507211453 100644
--- a/auth/common_auth.h
+++ b/auth/common_auth.h
@@ -79,6 +79,7 @@ struct auth_usersupplied_info
 
 	struct {
 		uint32_t negotiate_flags;
+		bool authenticate_kerberos;
 		enum netr_SchannelType secure_channel_type;
 		const char *computer_name; /* [charset(UTF8)] */
 		const char *account_name; /* [charset(UTF8)] */