summaryrefslogtreecommitdiffstats
path: root/secure/libexec
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2006-05-13 13:47:45 +0000
committerdes <des@FreeBSD.org>2006-05-13 13:47:45 +0000
commit148092431d1700e589fcbead33eda45aeb88731d (patch)
tree74ec58d937814ef5ae4b74379961ddfd2a9fc64e /secure/libexec
parent18f5285192dd391a2cc7a50f73bf1f90664fce6b (diff)
downloadFreeBSD-src-148092431d1700e589fcbead33eda45aeb88731d.zip
FreeBSD-src-148092431d1700e589fcbead33eda45aeb88731d.tar.gz
Introduce a namespace munging hack inspired by NetBSD to avoid polluting
the namespace of applications which inadvertantly link in libssh (usually through pam_ssh) Suggested by: lukem@netbsd.org MFC after: 6 weeks
Diffstat (limited to 'secure/libexec')
-rw-r--r--secure/libexec/sftp-server/Makefile2
-rw-r--r--secure/libexec/ssh-keysign/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index 28cff68..6dce308 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -3,7 +3,7 @@
PROG= sftp-server
SRCS= sftp-server.c sftp-common.c
MAN= sftp-server.8
-CFLAGS+=-I${SSHDIR}
+CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
LDADD= -lssh -lcrypt -lcrypto -lz
diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
index 3f2ed51..9ea9241 100644
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@@ -3,7 +3,7 @@
PROG= ssh-keysign
SRCS= ssh-keysign.c readconf.c
MAN= ssh-keysign.8
-CFLAGS+=-I${SSHDIR}
+CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
.if defined(ENABLE_SUID_SSH)
BINMODE=4511
.endif
OpenPOWER on IntegriCloud