summaryrefslogtreecommitdiffstats
path: root/secure
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2012-03-24 19:41:43 +0000
committereadler <eadler@FreeBSD.org>2012-03-24 19:41:43 +0000
commita3eef43dfb037e531a07691894933a20c769ee56 (patch)
tree058b463f075c0c6c39e1b170d9f052e6d5cc15a4 /secure
parente546223a7dd821a4c793b526c0bed8ba4003cf6d (diff)
downloadFreeBSD-src-a3eef43dfb037e531a07691894933a20c769ee56.zip
FreeBSD-src-a3eef43dfb037e531a07691894933a20c769ee56.tar.gz
Restore the ability to use a non-standard LOCALBASE to sshd
Add the ability to use a non-standard LOCALBASE to ssh Submitted by: jhb Reviewed by: des Approved by: cperciva MFC after: 0 days (with r233136)
Diffstat (limited to 'secure')
-rw-r--r--secure/usr.bin/ssh/Makefile4
-rw-r--r--secure/usr.sbin/sshd/Makefile4
2 files changed, 8 insertions, 0 deletions
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 619c44a..9304fd5 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -28,6 +28,10 @@ LDADD+= -lgssapi
DPADD+= ${LIBCRYPT} ${LIBCRYPTO}
LDADD+= -lcrypt -lcrypto
+.if defined(LOCALBASE)
+CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
+.endif
+
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 0120771..cc914c4 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -43,6 +43,10 @@ LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lasn1
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
+.if defined(LOCALBASE)
+CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
+.endif
+
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
OpenPOWER on IntegriCloud