From nobody Tue Mar 11 14:39:58 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 4ZBxHg5cTGz5qf7q; Tue, 11 Mar 2025 14:39:59 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZBxHg1zhGz3CRj; Tue, 11 Mar 2025 14:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741703999; 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=RUs/o5nP6F+e2iVF9XBYBTI5hRlXl8if5gQwFXDgBkU=; b=cjxuQXKpsGjGOqRq6p0X2CUmuyUPxWyAUTJiHj1J9rOms6W/GijoRUYnd6SJLe9UzimaEd HZrn+g3D4YidyDpzNvreMOMxKAuBtxAUrCZOYzwz7SFry/4T9tZ8htU7o2RKPzhiviTrf1 G7ecER5xnU4FwJkO2QHFUa0RBAu2kW6ENMcKCvYwVE0md1pxbkhg9Y29kxZ2fqVadO8qjx 8+kwpVBC0STRCJJMpygg9bB/BSgpE8O4lWq5FLJCNYjsf26oepYIvOajlS39x6FPkySLxU bkG4HNGRET5ajTrt+Jo77dGQsn15/haa24URPyqzV5hP2f4r6Gf0uDLl3eUKuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741703999; a=rsa-sha256; cv=none; b=xqlzNI56nvG+LTaSov2oI3NcSF2U73vNzeZiYQu4p9Bhr5TKbeRld8F8b6IAT4P3yKJgr+ BTdwOuUD+ThgAsImdVRn9ZOU4CvAhhShd+GRYCARZEukOiqqOjRXfriE3n+Mzhu1VVr46W EHr/7zffzjtMa7UDr/vQ9BDRk7oJcERbdVW6psLJG8wSJPp0iLL3ilB39WudiE2t4hBkCy x3v8iSg1X7/IlkC7iCMkE1mOJ8exMH44tB9l535FJmoUvtBlkrsiO6ye5QrMkFVF5hcT3T 4Bnyfx2GiQalw+HQ7n6jmzpptZzb1OOhFngQnhmkQC/hXU8fzQAEi7DFjH5BTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741703999; 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=RUs/o5nP6F+e2iVF9XBYBTI5hRlXl8if5gQwFXDgBkU=; b=GMct6o5hY92bsfmD23BmRLsxc7LVDMjn4B5by5Vgw8nwSEDRyt/Qo4kfLjvc1ytowEJ4Uc 8oXl4SLTjsD3DfNwjlTorHzA7VlT1iEC+3AHh0e+JhTEk1fTvh16yKg8gQ9jixcJIUalng +lNGVHLB1rJ6pd6B6rr08dFpYRuF5AF7uBiV1eXmzEnYE1oM87d8InuvR//7goOlgBF+Vf 1GrCTg/1LUj2BIMHu1DJRa2puiZRRAKd1DLfAryos1J1K6vAJIj19YovQTtN+bMqLGaKJy AgOM/U+XsX2p5hmudo1s58J24+n0llmrwS8QRetlc+XB1JdNPE0WPxgEm7Esqg== 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 4ZBxHg0rWqzTbR; Tue, 11 Mar 2025 14:39:59 +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 52BEdw2e086741; Tue, 11 Mar 2025 14:39:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52BEdwn1086739; Tue, 11 Mar 2025 14:39:58 GMT (envelope-from git) Date: Tue, 11 Mar 2025 14:39:58 GMT Message-Id: <202503111439.52BEdwn1086739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: be7b17651100 - stable/14 - ssh: tidy include handling 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/stable/14 X-Git-Reftype: branch X-Git-Commit: be7b176511003be3d47ae463fd6bea5659446c70 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=be7b176511003be3d47ae463fd6bea5659446c70 commit be7b176511003be3d47ae463fd6bea5659446c70 Author: Ed Maste AuthorDate: 2022-03-02 14:45:23 +0000 Commit: Ed Maste CommitDate: 2025-03-11 14:39:36 +0000 ssh: tidy include handling Centralize optional krb5_config.h handling in ssh.mk. Do not add headers (that are committed to the src tree) to SRCS as there is no need. Reviewed by: imp, jlduran, kevans (all earlier) MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34409 (cherry picked from commit 7f916236044d9a733de8b3c47b5dcbf71988cb03) --- secure/lib/libssh/Makefile | 5 ----- secure/libexec/sshd-session/Makefile | 2 -- secure/ssh.mk | 5 ++++- secure/usr.bin/ssh/Makefile | 2 -- secure/usr.sbin/sshd/Makefile | 2 -- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index ea09ccba8719..0a5b25e6780d 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -51,11 +51,6 @@ SRCS+= getrrsetbyname-ldns.c LIBADD+= ldns .endif -.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" -CFLAGS+= -include krb5_config.h -SRCS+= krb5_config.h -.endif - .if defined(LOCALBASE) CFLAGS+= -D_PATH_SSH_ASKPASS_DEFAULT='"${LOCALBASE}/bin/ssh-askpass"' .endif diff --git a/secure/libexec/sshd-session/Makefile b/secure/libexec/sshd-session/Makefile index e365b0c53dde..bce96112f65a 100644 --- a/secure/libexec/sshd-session/Makefile +++ b/secure/libexec/sshd-session/Makefile @@ -45,8 +45,6 @@ LDFLAGS+=-L${LIBBLACKLISTDIR} .endif .if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" -CFLAGS+= -include krb5_config.h -SRCS+= krb5_config.h LIBADD+= gssapi_krb5 gssapi krb5 .endif diff --git a/secure/ssh.mk b/secure/ssh.mk index c331e40c16f8..bd88e43aa0a3 100644 --- a/secure/ssh.mk +++ b/secure/ssh.mk @@ -5,7 +5,10 @@ SSHDIR= ${SRCTOP}/crypto/openssh CFLAGS+= -I${SSHDIR} -include ssh_namespace.h -SRCS+= ssh_namespace.h + +.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" +CFLAGS+= -include krb5_config.h +.endif CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE:U/usr/local}/bin/xauth\" diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index f5560acb8799..e16433ec5d1d 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -23,8 +23,6 @@ CFLAGS+= -DHAVE_LDNS=1 .endif .if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" -CFLAGS+= -include krb5_config.h -SRCS+= krb5_config.h LIBADD+= gssapi .endif diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 2a49c6ad0203..5d6dca203a0b 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -18,8 +18,6 @@ moduli: .MADE LIBADD= ssh util .if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" -CFLAGS+= -include krb5_config.h -SRCS+= krb5_config.h LIBADD+= gssapi_krb5 gssapi krb5 .endif