[Midnightbsd-cvs] src [7182] trunk/secure: update for newer kerberos code
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Jul 27 21:14:44 EDT 2015
Revision: 7182
http://svnweb.midnightbsd.org/src/?rev=7182
Author: laffer1
Date: 2015-07-27 21:14:43 -0400 (Mon, 27 Jul 2015)
Log Message:
-----------
update for newer kerberos code
Modified Paths:
--------------
trunk/secure/usr.bin/ssh/Makefile
trunk/secure/usr.sbin/sshd/Makefile
Modified: trunk/secure/usr.bin/ssh/Makefile
===================================================================
--- trunk/secure/usr.bin/ssh/Makefile 2015-07-28 01:14:30 UTC (rev 7181)
+++ trunk/secure/usr.bin/ssh/Makefile 2015-07-28 01:14:43 UTC (rev 7182)
@@ -17,6 +17,7 @@
.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL -DHAVE_KRB5_GET_ERROR_MESSAGE
+CFLAGS+= -include krb5_config.h
DPADD+= ${LIBGSSAPI}
LDADD+= -lgssapi
.endif
Modified: trunk/secure/usr.sbin/sshd/Makefile
===================================================================
--- trunk/secure/usr.sbin/sshd/Makefile 2015-07-28 01:14:30 UTC (rev 7181)
+++ trunk/secure/usr.sbin/sshd/Makefile 2015-07-28 01:14:43 UTC (rev 7182)
@@ -34,13 +34,15 @@
.endif
.if ${MK_KERBEROS_SUPPORT} != "no"
-CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DHAVE_GSSAPI_GSSAPI_KRB5_H=1 -DKRB5 -DHEIMDAL -DHAVE_KRB5_GET_ERROR_MESSAGE=1
-DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1}
-LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lasn1
+CFLAGS+= -include krb5_config.h
+DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \
+ ${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC}
+LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \
+ -lcom_err -lroken -lwind -lheimbase -lheimipcc
.endif
-DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
-LDADD+= -lcrypto -lcrypt
+DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LDADD+= -lcrypt -lcrypto -lz
# Fix the order of NEEDED entries for libthr and libc. The libthr
# needs to interpose libc symbols, leaving the libthr loading as
@@ -61,3 +63,6 @@
.PATH: ${SSHDIR}
${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
+.if ${MK_KERBEROS_SUPPORT} != "no"
+${OBJS} ${POBJS} ${SOBJS}: krb5_config.h
+.endif
More information about the Midnightbsd-cvs
mailing list