The branch main has been updated by cy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=1b735665f45a3a1ca8661c54e22d540fb1c4d673
commit 1b735665f45a3a1ca8661c54e22d540fb1c4d673
Author: Cy Schubert <c...@freebsd.org>
AuthorDate: 2025-06-11 02:45:02 +0000
Commit: Cy Schubert <c...@freebsd.org>
CommitDate: 2025-06-16 02:49:37 +0000
etc/gss: Add MIT GSS glue
The MIT GSS uses different library names. And MIT KRB5 supports more
OIDs than our ancient Heimdal does.
The intention is to remove etc/gss when Heimdal is finally retired and
rename etc/gss-krb5 to etc/gss.
Sponsored by: The FreeBSD Foundation
Differential revision: https://reviews.freebsd.org/D50812
---
etc/Makefile | 10 ++++++++++
etc/gss-krb5/Makefile | 5 +++++
etc/gss-krb5/mech | 10 ++++++++++
etc/gss-krb5/qop | 1 +
4 files changed, 26 insertions(+)
diff --git a/etc/Makefile b/etc/Makefile
index 4e387e8543d0..da9288bddaae 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -15,6 +15,12 @@ SUBDIR+=termcap
SUBDIR+=sendmail
.endif
+.if ${MK_MITKRB5} != "no"
+SUBDIR+=gss-krb5
+.else
+SUBDIR+=gss
+.endif
+
# NB: keep these sorted by MK_* knobs
ETCMAIL=aliases
@@ -53,7 +59,11 @@ distribution:
@echo "set DESTDIR before running \"make ${.TARGET}\""
@false
.endif
+.if ${MK_MITKRB5} != "no"
+ ${_+_}cd ${.CURDIR}/gss-krb5; ${MAKE} install
+.else
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
+.endif
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
diff --git a/etc/gss-krb5/Makefile b/etc/gss-krb5/Makefile
new file mode 100644
index 000000000000..301a8e074e8c
--- /dev/null
+++ b/etc/gss-krb5/Makefile
@@ -0,0 +1,5 @@
+FILES= mech qop
+NO_OBJ=
+FILESDIR= /etc/gss
+
+.include <bsd.prog.mk>
diff --git a/etc/gss-krb5/mech b/etc/gss-krb5/mech
new file mode 100644
index 000000000000..94fed68a24eb
--- /dev/null
+++ b/etc/gss-krb5/mech
@@ -0,0 +1,10 @@
+#
+# Name OID Library name Kernel
module
+kerberosv5 1.2.840.113554.1.2.2 /usr/lib/libgssapi_krb5.so.121
kgssapi_krb5
+kerberosv5 1.2.840.113554.1.2.3 /usr/lib/libgssapi_krb5.so.121
kgssapi_krb5
+kerberosv5 1.3.6.1.5.5.2 /usr/lib/libgssapi_krb5.so.121
kgssapi_krb5
+kerberosv5 1.2.840.48018.1.2.2.1 /usr/lib/libgssapi_krb5.so.121
kgssapi_krb5
+kerberosv5 1.2.840.48018.1.2.2.2 /usr/lib/libgssapi_krb5.so.121
kgssapi_krb5
+kerberosv5 1.2.840.48018.1.2.2.4 /usr/lib/libgssapi_krb5.so.121
kgssapi_krb5
+kerberosv5 1.2.840.48018.1.2.2.5 /usr/lib/libgssapi_krb5.so.121
kgssapi_krb5
+kerberosv5 1.3.5.1.5.2 /usr/lib/libgssapi_krb5.so.121
kgssapi_krb5
diff --git a/etc/gss-krb5/qop b/etc/gss-krb5/qop
new file mode 100644
index 000000000000..7d5b6b8f33dd
--- /dev/null
+++ b/etc/gss-krb5/qop
@@ -0,0 +1 @@
+GSS_KRB5_CONF_C_QOP_DES3_KD 0x0200 kerberosv5
