From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Tue, 7 Oct 2025 16:00:32 +0000 (+0200)
Subject: lib-sasl: sasl-server-mech-gssapi - Move krb5 oid definition to lib-auth/auth-gssapi... 
X-Git-Tag: 2.4.2~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cafc6246d083c932130607556977246df6e15609;p=thirdparty%2Fdovecot%2Fcore.git

lib-sasl: sasl-server-mech-gssapi - Move krb5 oid definition to lib-auth/auth-gssapi and make it const
---

diff --git a/src/lib-auth/auth-gssapi.c b/src/lib-auth/auth-gssapi.c
index 008dfdb067..9eb8777469 100644
--- a/src/lib-auth/auth-gssapi.c
+++ b/src/lib-auth/auth-gssapi.c
@@ -3,6 +3,12 @@
 #include "lib.h"
 #include "auth-gssapi.h"
 
+static const gss_OID_desc auth_gssapi_mech_krb5_oid_desc =
+	{ 9, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02" };
+
+const gss_OID_desc *auth_gssapi_mech_krb5_oid =
+	&auth_gssapi_mech_krb5_oid_desc;
+
 bool auth_gssapi_oid_equal(const gss_OID_desc *oid1, const gss_OID_desc *oid2)
 {
 	return (oid1->length == oid2->length &&
diff --git a/src/lib-auth/auth-gssapi.h b/src/lib-auth/auth-gssapi.h
index 3dd28638e0..14ceba2438 100644
--- a/src/lib-auth/auth-gssapi.h
+++ b/src/lib-auth/auth-gssapi.h
@@ -17,6 +17,8 @@
 #  include <gssapi/gssapi_ext.h>
 #endif
 
+extern const gss_OID_desc *auth_gssapi_mech_krb5_oid;
+
 bool auth_gssapi_oid_equal(const gss_OID_desc *oid1, const gss_OID_desc *oid2);
 
 #endif
diff --git a/src/lib-sasl/sasl-server-mech-gssapi.c b/src/lib-sasl/sasl-server-mech-gssapi.c
index 963c30b70c..28bd6d266c 100644
--- a/src/lib-sasl/sasl-server-mech-gssapi.c
+++ b/src/lib-sasl/sasl-server-mech-gssapi.c
@@ -54,9 +54,6 @@ struct gssapi_auth_mech {
 	const char *hostname;
 };
 
-static gss_OID_desc mech_gssapi_krb5_oid =
-	{ 9, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02" };
-
 static int
 mech_gssapi_wrap(struct gssapi_auth_request *request, gss_buffer_desc inbuf);
 
@@ -261,7 +258,8 @@ mech_gssapi_sec_context(struct gssapi_auth_request *request,
 
 	switch (major_status) {
 	case GSS_S_COMPLETE:
-		if (!auth_gssapi_oid_equal(mech_type, &mech_gssapi_krb5_oid)) {
+		if (!auth_gssapi_oid_equal(mech_type,
+					   auth_gssapi_mech_krb5_oid)) {
 			e_info(auth_request->event,
 			       "GSSAPI mechanism not Kerberos5");
 			ret = -1;