Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Feb 2025 17:39:41 GMT
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: b4bb480ae929 - main - ssh: Remove unintended XAUTH_PATH setting
Message-ID:  <202502191739.51JHdfLZ016910@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=b4bb480ae9294d7e4b375f0ead9ae57517c79ef3

commit b4bb480ae9294d7e4b375f0ead9ae57517c79ef3
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-02-19 17:37:09 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2025-02-19 17:39:17 +0000

    ssh: Remove unintended XAUTH_PATH setting
    
    This crept in while rebasing the OpenSSH 9.8p1 update across
    a63701848fe5 ("ssh: Move XAUTH_PATH setting to ssh.mk").
    
    Fixes: 0fdf8fae8b56 ("openssh: Update to 9.8p1")
    Sponsored by:   The FreeBSD Foundation
---
 secure/libexec/sshd-session/Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/secure/libexec/sshd-session/Makefile b/secure/libexec/sshd-session/Makefile
index 2461962f00e2..e365b0c53dde 100644
--- a/secure/libexec/sshd-session/Makefile
+++ b/secure/libexec/sshd-session/Makefile
@@ -57,10 +57,6 @@ LIBADD+=	wrap
 
 LIBADD+=	crypto
 
-.if defined(LOCALBASE)
-CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
-.endif
-
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502191739.51JHdfLZ016910>