From nobody Mon Jun 16 02:51:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bLDzw4btJz5yMsr; Mon, 16 Jun 2025 02:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLDzv5JZ3z3S7q; Mon, 16 Jun 2025 02:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o7tbuPTlplKAIEQoF0YyOPvrHMV6dtrSX60Twi73nCM=; b=Qwt75Tt4uKO6bwZMaAr9b9EO1fJGbLTHHvBsjXTZlWonq1WKXBwYwQ/BdMFnGGMZw1xqho tOvI4LilfeZ2TQOGF4DVtOms5+nupFOmhBDxliomQJN2ND6uwikt+oHBTxM9ztqE0K9S7a 3XD3ZJZBRe05A2PN8Z4grW3yxLOFUsLSm5ZEymEwQK36KO5VjnxSdHqQy20tsEN87rgOVL toGrl4whby7QCjbrW0MXlOMeC7JETgTPNYA48tWYm6q/VOB4sRiBBkKJZfdeuedfN16J7b x8lVGdgZ3SCPOx/Y9z7T3eRC0aeng8MLvgLDW4z/xg+Ozytv2Ulhjo6Q9VCeEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o7tbuPTlplKAIEQoF0YyOPvrHMV6dtrSX60Twi73nCM=; b=UDK5eyB6LibWO3uymsTzZem6omVC3QNWhG1dkO4GVUFDB+Eh6BYee2JcGqX+4yZ2Ycj3wg rHU5Mdq9jQDuAG3MBBo3eipz0Ev1DQeapibctJ/VmZZDkZtQInFDK0VFAUqCQhAQuK+AFS AmVk6LI69KKyUnhqHxNfGvmokwf7DxfEQjBeSH2Bzg9hB71UfiImUbv5gPU1rvShMxPB7s TN7TekAo6ftAKuWTMUnPYNQJHggWV8U7ukts6PPV+n09n2xacYaux965a5vh/wFcpFDbwS X75PEOTFNO7xrYecrMVmPJ2ee6PmKt3fR0xgN5qswR0tKMRruO8b/pn/jQ4Knw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042315; a=rsa-sha256; cv=none; b=c594bmJXv/h4wKUprj3uBWY1l0MZTRFhcL1EllEg5I2zTkGdWl7k7n1LPmA7HWhy5tceZo qVWWTMvBJ5Yv/qhXu1qSsOe3cBdwhulNC24C1vW4ABGWUDQalSVMMl4BZ8B8auV1wK3AAB vu7rAfOaZ3jYOdkT4S1tggG70Vxg2Pzq6EKDnEi3F6x6S0KCn8rmpCe7kvHHDrMV2Jt5kx naL417jJV2+3VqpNF3x9QqNs++uJHv0TrtxU6y5V46FcJKUWjYnkvhX7PXnJBzMlQguNS+ Tj/KtSfoywk9PEMj2LUWUd9j8mfOvPOF/OYSzznXS96iEu2VJ9vdjhX/Uu1e4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bLDzv4VjKzggg; Mon, 16 Jun 2025 02:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55G2ptkj063125; Mon, 16 Jun 2025 02:51:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2ptHj063122; Mon, 16 Jun 2025 02:51:55 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:55 GMT Message-Id: <202506160251.55G2ptHj063122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 1b735665f45a - main - etc/gss: Add MIT GSS glue List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b735665f45a3a1ca8661c54e22d540fb1c4d673 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=1b735665f45a3a1ca8661c54e22d540fb1c4d673 commit 1b735665f45a3a1ca8661c54e22d540fb1c4d673 Author: Cy Schubert AuthorDate: 2025-06-11 02:45:02 +0000 Commit: Cy Schubert 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 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