diff options
| author |   deraadt <deraadt@openbsd.org> | 2003-07-15 19:02:19 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2003-07-15 19:02:19 +0000 |
| commit | 01f43b51ba2f9584a187db882ab270ab0643969b (patch) | |
| tree | 704143266addc3e69965d1e1b3e805c37fb060fc /usr.bin | |
| parent | Don't compress a file that already has a known compression prefix. (diff) | |
| download | wireguard-openbsd-01f43b51ba2f9584a187db882ab270ab0643969b.tar.xz wireguard-openbsd-01f43b51ba2f9584a187db882ab270ab0643969b.zip | |
stop using libcom_err, it is built into krb5
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/passwd/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/telnet/Makefile | 6 |
4 files changed, 12 insertions, 12 deletions
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 |