From nobody Thu Feb 20 22:39:56 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 4YzSrF2pqWz5pWjC; Thu, 20 Feb 2025 22:39:57 +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 4YzSrF288xz4MPv; Thu, 20 Feb 2025 22:39:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740091197; 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=Qf9GdkKVCA/X1rMhLHQIgQqm/4MI+nTEJKu1XGfO4J8=; b=luZ1wv05j5o7NjAUkZ89MSBhcjkPOWR5wxTAw7mcYM6jI1Ym2di7w+5iEt5RiU4Ymwuit8 RwPw8kPVDug8ju56KsbcM+sQieisGQIn+XwTg9DOj+SS29kXTEvWseyxep/cQXCZRcyEnT WvTgeQyiflnSoKwVfso2cO0/5Utis7x+Km9kKmQPv80tSMEv1zn7zVqRYit6bWdyrOhrjC F778JECKpr6Q+H7EyDy93g8aZ5KckR60o0fo2/BL2jZGhtXZ5qgqNz78Ta21gwyRu4ZnH3 Ej1WAmmbKykthEPX+1gMLS5WIcVUsh5wSBX9F7Dy/XFMm4CULI8ZVhcFK+37TQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740091197; a=rsa-sha256; cv=none; b=EpmiFtqx5tj3sW8UiZHbim14tlTlJcl1phDv2BEd9gjOv+YGC2XjcthAF6v8sneiOy3xEs EgKnjXaybajcln8rroER2BMdVzcxFBO4NeoTLdrUWR+ZI0fHNKLbKNgnjAsBfhG2thlpja ++i7855elN4N/NwADAAk1ame7wGsF0Nv2b1JiPW30eleXAUyQw1GAAR5Y47GdM85Aq8Epq ezw422kRZ99lLj3Z+z3rP39a+ZZdAUHSzrQp9qXjjINBPvH5kISEkkiKl4xtL5bWDQK9FB GOInIKcIY322vmyeTN/cF49bzRKqhb8BokWRrWdM+U7/3mf6jFyiIJw75Xftdw== 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=1740091197; 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=Qf9GdkKVCA/X1rMhLHQIgQqm/4MI+nTEJKu1XGfO4J8=; b=ZZ8qoimFcS39FIyLKrkajhwn0q5SO5tdwbFc9PgI81egLMeY8LlaJftKJF8aupisZ8y7Ze iB3tDE+Hy32YvDGPu4SanoKn7HxzxRcPkL+uz7KA+6kuc8bQfE27cWCodYfOdsl3ddAP4x /vegm4ujjdL6Zwqlpn+Qu/FFkhClMwQha0ZAaJtmqa5qbLiWdtiCrIRfetpFptyctDgZqG dcrotn2PeIB3gEokiLxbZZcVYWTHUtSLoAs2sAGFroeqYk9oJWHbwnlGFpJzWo/jvmMCNz iPwtRxJ5s36r9adu2Jv7NJiOVGcccWVOCvghNX3r7BP6DV2vfdbSWJLMS8zDTQ== 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 4YzSrF0sZwz19ZN; Thu, 20 Feb 2025 22:39:57 +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 51KMduXA092615; Thu, 20 Feb 2025 22:39:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KMdup4092612; Thu, 20 Feb 2025 22:39:56 GMT (envelope-from git) Date: Thu, 20 Feb 2025 22:39:56 GMT Message-Id: <202502202239.51KMdup4092612@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: 7f916236044d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 7f916236044d9a733de8b3c47b5dcbf71988cb03 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7f916236044d9a733de8b3c47b5dcbf71988cb03 commit 7f916236044d9a733de8b3c47b5dcbf71988cb03 Author: Ed Maste AuthorDate: 2022-03-02 14:45:23 +0000 Commit: Ed Maste CommitDate: 2025-02-20 22:39:48 +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 --- 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 c8cf1fe6de80..43fa46149dfa 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -50,11 +50,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 9bff63f29395..aba1bce9c9a1 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -22,8 +22,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 d5bcf008e233..d3b228bbbeb4 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -17,8 +17,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