link to the new kerberos libraries

7 files changed, 17 insertions, 11 deletions

diff --git a/gnu/usr.bin/cvs/configure b/gnu/usr.bin/cvs/configure
index e11e0cdaeb9..ce567e6333c 100644
--- a/gnu/usr.bin/cvs/configure
+++ b/gnu/usr.bin/cvs/configure
@@ -4021,7 +4021,7 @@ EOF
   includeopt="${includeopt} -I$GSSAPI/include/kerberosV"
   # FIXME: This is ugly, but these things don't seem to be standardized.
   if test "$ac_cv_header_gssapi_h" = "yes"; then
-    LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lcrypto"
+    LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lcrypto -lheimbase -lhx509 -lasn1 -lwind -lroken -lcom_err -lheimntlm -lpthread"
   else
     LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
   fi
diff --git a/libexec/login_krb5-or-pwd/Makefile b/libexec/login_krb5-or-pwd/Makefile
index ec26f9e979a..4bb77fffccc 100644
--- a/libexec/login_krb5-or-pwd/Makefile
+++ b/libexec/login_krb5-or-pwd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 2010/10/13 08:14:22 jsg Exp $
+#	$OpenBSD: Makefile,v 1.15 2013/06/17 19:23:33 robert Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,8 @@ CFLAGS+=-DPASSWD -Wall -I${.CURDIR}/../login_passwd
 .if (${KERBEROS5:L} == "yes")
 SRCS+=	login_krb5.c
 DPADD+=  ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBUTIL}
-LDADD+=	-lkrb5 -lasn1 -lcrypto -lutil
+LDADD+=	-lkrb5 -lhx509 -lasn1 -lcrypto -lutil
+LDADD+=	-lwind -lroken -lcom_err -lpthread -lheimbase
 CFLAGS+=-DKRB5
 .PATH:	${.CURDIR}/../login_passwd ${.CURDIR}/../login_krb5 ${.CURDIR}/../../usr.bin/passwd
 .else
diff --git a/libexec/login_krb5/Makefile b/libexec/login_krb5/Makefile
index 8353d4ec512..35d2e3310d9 100644
--- a/libexec/login_krb5/Makefile
+++ b/libexec/login_krb5/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2010/10/13 08:14:22 jsg Exp $
+#	$OpenBSD: Makefile,v 1.18 2013/06/17 19:23:33 robert Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,8 @@ CFLAGS+=-Wall -I${.CURDIR}/../login_passwd
 .if (${KERBEROS5:L} == "yes")
 SRCS+=	login_krb5.c
 DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
-LDADD+=	-lkrb5 -lasn1 -lcrypto
+LDADD+=	-lkrb5 -lhx509 -lasn1 -lcrypto
+LDADD+= -lwind -lroken -lcom_err -lpthread -lheimbase
 CFLAGS+=-DKRB5
 .endif
 
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 679ca85299f..c8bd9a19ea3 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.32 2010/10/15 10:18:42 jsg Exp $
+#	$OpenBSD: Makefile,v 1.33 2013/06/17 19:23:33 robert Exp $
 
 .include <bsd.own.mk>
 
@@ -22,6 +22,7 @@ SRCS+= krb5_passwd.c
 CFLAGS+= -DKRB5
 DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
 LDADD+=	-lkrb5 -lasn1 -lcrypto
+LDADD+= -lhx509 -lwind -lroken -lcom_err -lpthread -lheimbase
 .endif
 
 BINMODE=4555
diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile
index 4261a7c0b2d..1865aec39e0 100644
--- a/usr.bin/ssh/ssh/Makefile
+++ b/usr.bin/ssh/ssh/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.57 2013/05/16 09:12:31 dtucker Exp $
+#	$OpenBSD: Makefile,v 1.58 2013/06/17 19:23:33 robert Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -26,7 +26,8 @@ CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV -DGSSAPI
 
 .if (${KERBEROS5:L} == "yes")
 DPADD+=  ${LIBGSSAPI} ${LIBKRB5}
-LDADD+=  -lgssapi -lkrb5
+LDADD+=  -lgssapi -lkrb5 -lasn1 -lheimntlm
+LDADD+=  -lhx509 -lwind -lroken -lcom_err -lpthread -lheimbase
 .endif # KERBEROS5
 
 DPADD+=	${LIBCRYPTO} ${LIBZ}
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index 15417811a83..2e8bb2a54f5 100644
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.73 2011/06/22 21:57:01 djm Exp $
+#	$OpenBSD: Makefile,v 1.74 2013/06/17 19:23:33 robert Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -28,7 +28,8 @@ SRCS+=  auth-krb5.c auth2-gss.c gss-serv.c gss-serv-krb5.c
 .include <bsd.prog.mk>
 
 .if (${KERBEROS5:L} == "yes")
-LDADD+= -lgssapi -lkrb5 -lkafs
+LDADD+= -lgssapi -lkrb5 -lasn1 -lheimntlm
+LDADD+= -lhx509 -lwind -lroken -lcom_err -lpthread -lheimbase -lkafs5
 DPADD+= ${LIBGSSAPI} ${LIBKRB5}
 .endif
 
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index 0276fa23de0..152e1caadac 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.24 2010/10/15 10:18:42 jsg Exp $
+#	$OpenBSD: Makefile,v 1.25 2013/06/17 19:23:33 robert Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -47,6 +47,7 @@ SRCS=	authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
 CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB5 -DDES_ENCRYPTION
 DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
 LDADD+= -lkrb5 -lasn1 -lcrypto
+LDADD+= -lhx509 -lwind -lroken -lcom_err -lpthread -lheimbase
 SRCS+= kerberos5.c enc_des.c
 .endif