stop using libcom_err, it is built into krb5

8 files changed, 24 insertions, 25 deletions

diff --git a/libexec/login_chpass/Makefile b/libexec/login_chpass/Makefile
index ad88ee1f81e..67cdfae458b 100644
--- a/libexec/login_chpass/Makefile
+++ b/libexec/login_chpass/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2003/05/14 07:31:30 mho Exp $
+#	$OpenBSD: Makefile,v 1.4 2003/07/15 19:02:19 deraadt Exp $
 
 
 PROG=	login_chpass
@@ -14,8 +14,8 @@ CFLAGS+=-Wall
 #.if (${KERBEROS:L} == "yes")
 #CFLAGS+=-DKERBEROS
 #SRCS+=	new_pwd.c
-#DPADD+= ${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCOM_ERR}
-#LDADD+= -lkadm -lkrb -ldes -lcom_err
+#DPADD+= ${LIBKADM} ${LIBKRB} ${LIBDES}
+#LDADD+= -lkadm -lkrb -ldes
 #.endif
 
 .if (${YP:L} == "yes")
diff --git a/libexec/login_krb5-or-pwd/Makefile b/libexec/login_krb5-or-pwd/Makefile
index f3fe047d10c..c3305d2272d 100644
--- a/libexec/login_krb5-or-pwd/Makefile
+++ b/libexec/login_krb5-or-pwd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2003/05/17 00:45:02 hin Exp $
+#	$OpenBSD: Makefile,v 1.10 2003/07/15 19:02:19 deraadt Exp $
 
 .include <bsd.own.mk>
 
@@ -10,8 +10,8 @@ CFLAGS+=-DPASSWD -Wall -Werror -I${.CURDIR}/../login_passwd
 .if (${KERBEROS5:L} == "yes")
 SRCS+=	login_krb5.c
 DPADD+=  ${LIBKRB} ${LIBCRYPTO} ${LIBUTIL} ${LIBKRB5} ${LIBKASN1} \
-	${LIBCOM_ERR} ${LIBKAFS} ${LIBDES}
-LDADD+=	-lkrb5 -lasn1 -lcrypto -lcom_err -lutil -ldes
+	${LIBKAFS} ${LIBDES}
+LDADD+=	-lkrb5 -lasn1 -lcrypto -lutil -ldes
 CFLAGS+=-DKRB5
 .PATH:	${.CURDIR}/../login_passwd ${.CURDIR}/../login_krb5
 .else
diff --git a/libexec/login_krb5/Makefile b/libexec/login_krb5/Makefile
index ac6e3886548..b57534881b9 100644
--- a/libexec/login_krb5/Makefile
+++ b/libexec/login_krb5/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.13 2003/05/17 00:43:46 hin Exp $
+#	$OpenBSD: Makefile,v 1.14 2003/07/15 19:02:19 deraadt Exp $
 
 .include <bsd.own.mk>
 
@@ -10,9 +10,8 @@ CFLAGS+=-Wall -Werror -I${.CURDIR}/../login_passwd
 
 .if (${KERBEROS5:L} == "yes")
 SRCS+=	login_krb5.c
-DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} \
-	${LIBDES}
-LDADD+=	-lkrb5 -lasn1 -lcrypto -lcom_err -ldes
+DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBKRB} ${LIBCRYPTO} ${LIBKAFS} ${LIBDES}
+LDADD+=	-lkrb5 -lasn1 -lcrypto -ldes
 CFLAGS+=-DKRB5
 .endif
 
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index 612cbbed42c..b43024ac99a 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.20 2003/07/02 22:44:12 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.21 2003/07/15 19:02:19 deraadt Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 12/15/93
 #	$NetBSD: Makefile,v 1.6 1996/02/24 01:22:12 jtk Exp $
 
@@ -18,8 +18,8 @@ MAN=	telnetd.8
 
 .if (${KERBEROS5:L} == "yes")
 CFLAGS+=-DENCRYPTION -DAUTHENTICATION -I${.CURDIR}/../../lib
-DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBDES} ${LIBCOM_ERR}
-LDADD+=	-lkrb5 -lasn1 -lcrypto -ldes -lcom_err
+DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBDES}
+LDADD+=	-lkrb5 -lasn1 -lcrypto -ldes
 .endif
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 31059b8234c..a0b61181868 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.27 2003/05/14 07:22:47 mho Exp $
+#	$OpenBSD: Makefile,v 1.28 2003/07/15 19:02:19 deraadt Exp $
 
 .include <bsd.own.mk>
 
@@ -21,8 +21,8 @@ CFLAGS+=-DYP -I${.CURDIR}/../../lib/libc/yp
 SRCS+= krb_passwd.c des_rw.c
 SRCS+= krb5_passwd.c
 CFLAGS+= -DKRB5
-DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBDES} ${LIBCOM_ERR} ${LIBCRYPTO}
-LDADD+=	-lkrb5 -lasn1 -ldes -lcom_err -lcrypto
+DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -lasn1 -ldes -lcrypto
 .endif
 
 BINMODE=4555
diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile
index f4ac2e300cb..60199a6f35f 100644
--- a/usr.bin/ssh/ssh/Makefile
+++ b/usr.bin/ssh/ssh/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.45 2003/05/17 01:31:21 hin Exp $
+#	$OpenBSD: Makefile,v 1.46 2003/07/15 19:02:20 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -19,8 +19,8 @@ SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
 
 .if (${KERBEROS5:L} == "yes")
 CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
-LDADD+=  -lkrb5 -lasn1 -lcom_err
-DPADD+=  ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR}
+LDADD+=  -lkrb5 -lasn1
+DPADD+=  ${LIBKRB5} ${LIBASN1}
 .endif # KERBEROS5
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index 078d5c864fc..3aa87db2e7a 100644
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.56 2003/05/17 01:31:21 hin Exp $
+#	$OpenBSD: Makefile,v 1.57 2003/07/15 19:02:20 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -23,8 +23,8 @@ SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 .if (${KERBEROS5:L} == "yes")
 CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV
 SRCS+=  auth-krb5.c auth2-krb5.c
-LDADD+= -lkrb5 -lasn1 -lcom_err
-DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} ${LIBCOM_ERR}
+LDADD+= -lkrb5 -lasn1
+DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1}
 .endif # KERBEROS5
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index 248fa8657ef..d6001abb1a7 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.20 2003/06/03 02:56:17 millert Exp $
+#	$OpenBSD: Makefile,v 1.21 2003/07/15 19:02:20 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -48,8 +48,8 @@ SRCS=	authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
 
 .if (${KERBEROS5:L} == "yes")
 CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB5 -DDES_ENCRYPTION
-LDADD+= -lkrb5 -lasn1 -lcrypto -lcom_err -ldes
-DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBDES}
+LDADD+= -lkrb5 -lasn1 -lcrypto -ldes
+DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBDES}
 SRCS+= kerberos5.c enc_des.c
 .endif