From nobody Tue Aug 26 19:14:29 2025 X-Original-To: dev-commits-src-all@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 4cBHQt14Ydz660Bj; Tue, 26 Aug 2025 19:14:30 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBHQt0Tppz4Gdx; Tue, 26 Aug 2025 19:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756235670; 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=HEkMb9Ej2sMPXVHqg+8H8ku+QwzqymjrRT4gBwYcMVo=; b=qP26ZITMxRBkR/qL+LP7KGufPRLXxvz5Y5k3xMm9RnvEJF/pSZg0gJ4+97klXTssuTCd0c ZgmmbOu1ebU3URAvKYEeOlDGCBLB/njjN40u2Jny0jYaXtu0XY3r4Ae97F9QgU61GafhqN BXiuI3QHvnWig61SevRvKP4QVFd85O0aWrVxSKc9xLg0X9trfcqRpCjiEWhSXCRJTc5/Fv YFjKz0AUZtLSAQI72CDYM/3TerPY9OnIhpceAiABH4crtaOVlXSy1jr/icAGMP/qSpEwp1 RPOvr9iTz5rGUvo32v/7SCVftRFzb+1k2z+/sIvSZiLlU9SJ92OoYgKHRPTE/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756235670; 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=HEkMb9Ej2sMPXVHqg+8H8ku+QwzqymjrRT4gBwYcMVo=; b=dt7guHK8zLveBrikLFjvGxs+NWKoYMc44k/UOM4ihcnRptE5pmJ+Q9dPB0cMSHpJSk3qOG VSWcDH5JLNUgsQ/7nW3Q85kBE/KXJpWjOamR34hwUQ7vlP7KXZVlxBrxnqoxDfMnaJ039o mBN3KsMN5Et+FO04elvrrCghNc73itkoG+QLgPAipszv2dvMyx6wsDJR9wtlZOvW+Md+Km i4DoQlE5a0DZTEaIg6Fqmvlt+6pPom/hM6Y30nZYYwpuCyqb4+9L+cKeHsU1shvSGGAVu4 9feVwPNep3KgbBUN+tjvTqPXLD32GkiwQZAynbzRahl9Cd3QnFF92nxb3avUfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756235670; a=rsa-sha256; cv=none; b=mM8a70NxE37VyL4WgK7Q8msBytqzDRotWR+pptbMWSpgGoRK1zqmJEo+dMqJrZx8VRG0Dy cAkbpbP6Ltt+1ZBt1jELXzWe9pnNicedbcC6GeWg8XI3IV+1rOf1IT/+lYfz5wlR/jk1AI dHOCeqrPjEpWSme1/soqxyYlUULZaDhLoepXaXpMvMKKb+sIgneGe3i5+l3pskXBT9XhB1 2UXBdYlAmcevkKwSaWrKOFGTbL40kQvQLV6tOnRtGvGen9LYRkThWKUrv7xagTwxMCZfhi ga8WdC228dL2/4g8ao9/z4ZDjbbmANbQL8QNX4MJQU3nvNFx26KUZKu3IFizJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cBHQt01dFzq7L; Tue, 26 Aug 2025 19:14:30 +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 57QJETUG005042; Tue, 26 Aug 2025 19:14:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57QJEThX005039; Tue, 26 Aug 2025 19:14:29 GMT (envelope-from git) Date: Tue, 26 Aug 2025 19:14:29 GMT Message-Id: <202508261914.57QJEThX005039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 665bf6ffb500 - main - sshd-auth: Chase MK_GSSAPI changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 665bf6ffb500f63b58cf971c99bb9d3f1413af9b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=665bf6ffb500f63b58cf971c99bb9d3f1413af9b commit 665bf6ffb500f63b58cf971c99bb9d3f1413af9b Author: Ed Maste AuthorDate: 2025-08-18 16:04:06 +0000 Commit: Ed Maste CommitDate: 2025-08-26 19:13:07 +0000 sshd-auth: Chase MK_GSSAPI changes Fixes: 8e28d84935f2 ("OpenSSH: Update to 10.0p2") Sponsored by: The FreeBSD Foundation --- secure/libexec/sshd-auth/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/secure/libexec/sshd-auth/Makefile b/secure/libexec/sshd-auth/Makefile index 6fc0626982db..a127b50b407a 100644 --- a/secure/libexec/sshd-auth/Makefile +++ b/secure/libexec/sshd-auth/Makefile @@ -38,16 +38,15 @@ LIBADD+= blacklist LDFLAGS+=-L${LIBBLACKLISTDIR} .endif -.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" -LIBADD+= gssapi_krb5 gssapi krb5 +.if ${MK_KERBEROS_SUPPORT} != "no" .if ${MK_MITKRB5} != "no" +LIBADD+= gssapi_krb5 krb5 .include "../../krb5/Makefile.inc" CFLAGS+= -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ - -I${KRB5_OBJTOP}/lib \ - -I${KRB5_DIR}/lib/gssapi/generic \ - -I${KRB5_DIR}/lib/gssapi/krb5 \ - -I${KRB5_DIR}/lib/gssapi/mechglue + -I${KRB5_OBJTOP}/lib +.else +LIBADD+= gssapi_krb5 gssapi krb5 .endif .endif