diff options
| author | kris <kris@FreeBSD.org> | 2000-08-23 09:39:20 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-08-23 09:39:20 +0000 |
| commit | aba57a02e85fdc43b0afab2cd3dc4b2c1f6ce808 (patch) | |
| tree | 6beaa695f3d6ded7ad0f8e2a8274adfdfda89d24 | |
| parent | 2e6e494673a01f28641a025e69405445a771bd88 (diff) | |
| download | FreeBSD-src-aba57a02e85fdc43b0afab2cd3dc4b2c1f6ce808.zip FreeBSD-src-aba57a02e85fdc43b0afab2cd3dc4b2c1f6ce808.tar.gz | |
Respect X11BASE to derive the location of xauth(1)
PR: 17818
Submitted by: Bjoern Fischer <bfischer@Techfak.Uni-Bielefeld.DE>
| -rw-r--r-- | crypto/openssh/includes.h | 2 | ||||
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/crypto/openssh/includes.h b/crypto/openssh/includes.h index 848a82f..9e181a7 100644 --- a/crypto/openssh/includes.h +++ b/crypto/openssh/includes.h @@ -58,7 +58,9 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #include "version.h" /* Define this to be the path of the xauth program. */ +#ifndef XAUTH_PATH #define XAUTH_PATH "/usr/X11R6/bin/xauth" +#endif /* * Define this to use pipes instead of socketpairs for communicating with the diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 2c7f18a..91900bf 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -36,5 +36,9 @@ DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT} .include <bsd.prog.mk> +.if defined(X11BASE) +CFLAGS+= -DXAUTH_PATH=${X11BASE}/bin/xauth +.endif + LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lutil -lz DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} |
