Page MenuHomeFreeBSD
Files F165008186

D34409.id151273.diff
No OneTemporary
Actions

D34409.id151273.diff
View Options

Index: secure/lib/libssh/Makefile
===================================================================
--- secure/lib/libssh/Makefile
+++ secure/lib/libssh/Makefile
@@ -50,11 +50,6 @@
LIBADD+= ldns
.endif
-.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
-CFLAGS+= -include krb5_config.h
-SRCS+= krb5_config.h
-.endif
-
.if defined(LOCALBASE)
CFLAGS+= -D_PATH_SSH_ASKPASS_DEFAULT='"${LOCALBASE}/bin/ssh-askpass"'
.endif
Index: secure/libexec/sshd-session/Makefile
===================================================================
--- secure/libexec/sshd-session/Makefile
+++ secure/libexec/sshd-session/Makefile
@@ -45,8 +45,6 @@
.endif
.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
-CFLAGS+= -include krb5_config.h
-SRCS+= krb5_config.h
LIBADD+= gssapi_krb5 gssapi krb5
.endif
Index: secure/ssh.mk
===================================================================
--- secure/ssh.mk
+++ secure/ssh.mk
@@ -5,7 +5,10 @@
SSHDIR= ${SRCTOP}/crypto/openssh
CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
-SRCS+= ssh_namespace.h
+
+.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
+CFLAGS+= -include krb5_config.h
+.endif
CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE:U/usr/local}/bin/xauth\"
Index: secure/usr.bin/ssh/Makefile
===================================================================
--- secure/usr.bin/ssh/Makefile
+++ secure/usr.bin/ssh/Makefile
@@ -22,8 +22,6 @@
.endif
.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
-CFLAGS+= -include krb5_config.h
-SRCS+= krb5_config.h
LIBADD+= gssapi
.endif
Index: secure/usr.sbin/sshd/Makefile
===================================================================
--- secure/usr.sbin/sshd/Makefile
+++ secure/usr.sbin/sshd/Makefile
@@ -17,8 +17,6 @@
LIBADD= ssh util
.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
-CFLAGS+= -include krb5_config.h
-SRCS+= krb5_config.h
LIBADD+= gssapi_krb5 gssapi krb5
.endif

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 6, 7:45 AM (1 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36098162
Default Alt Text
D34409.id151273.diff (1 KB)

Event Timeline