D48907.1790621224.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D48907.1790621224.diff
View Options

	Index: crypto/openssh/config.h
	===================================================================
	--- crypto/openssh/config.h
	+++ crypto/openssh/config.h
	@@ -2015,7 +2015,7 @@
	#endif

	/* Define if xauth is found in your path */
	-#define XAUTH_PATH "/usr/local/bin/xauth"
	+/* #undef XAUTH_PATH */

	/* Number of bits in a file offset, on hosts where this is settable. */
	/* #undef _FILE_OFFSET_BITS */
	Index: secure/ssh.mk
	===================================================================
	--- secure/ssh.mk
	+++ secure/ssh.mk
	@@ -7,6 +7,10 @@
	CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
	SRCS+= ssh_namespace.h

	+.if defined(LOCALBASE)
	+CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
	+.endif
	+
	.if ${MK_USB} != "no"
	# Built-in security key support
	CFLAGS+= -include sk_config.h
	Index: secure/usr.bin/ssh/Makefile
	===================================================================
	--- secure/usr.bin/ssh/Makefile
	+++ secure/usr.bin/ssh/Makefile
	@@ -29,10 +29,6 @@

	LIBADD+= crypto

	-.if defined(LOCALBASE)
	-CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
	-.endif
	-
	.include <bsd.prog.mk>

	.PATH: ${SSHDIR}
	Index: secure/usr.sbin/sshd/Makefile
	===================================================================
	--- secure/usr.sbin/sshd/Makefile
	+++ secure/usr.sbin/sshd/Makefile
	@@ -62,9 +62,6 @@

	LIBADD+= crypto

	-.if defined(LOCALBASE)
	-CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
	-.endif

	.include <bsd.prog.mk>