diff options
| author |   mho <mho@openbsd.org> | 2003-05-14 07:18:27 +0000 |
|---|---|---|
| committer | mho <mho@openbsd.org> | 2003-05-14 07:18:27 +0000 |
| commit | 1f91f17c47dbd2af956d468a3e2785a2bcd0791d (patch) | |
| tree | 3807fe6bb38504216a850612d7beb5e1fde8b569 | |
| parent | Remove krb4 support. (diff) | |
| download | wireguard-openbsd-1f91f17c47dbd2af956d468a3e2785a2bcd0791d.tar.xz wireguard-openbsd-1f91f17c47dbd2af956d468a3e2785a2bcd0791d.zip | |
Remove krb4 support.
| -rw-r--r-- | kerberosV/libexec/kdc/Makefile | 7 | ||||
| -rw-r--r-- | kerberosV/usr.sbin/ktutil/Makefile | 15 | ||||
| -rw-r--r-- | usr.bin/passwd/Makefile | 16 |
3 files changed, 17 insertions, 21 deletions
diff --git a/kerberosV/libexec/kdc/Makefile b/kerberosV/libexec/kdc/Makefile index ec50927d8cd..400eb569cff 100644 --- a/kerberosV/libexec/kdc/Makefile +++ b/kerberosV/libexec/kdc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2003/05/14 04:58:36 hin Exp $ +# $OpenBSD: Makefile,v 1.10 2003/05/14 07:20:34 mho Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -19,8 +19,9 @@ SRCS= 524.c \ .PATH: ${KRB5SRC}/kdc CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/kdc -DPADD+= ${LIBHDB} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBASN1} ${LIBCRYPTO} \ +DPADD+= ${LIBHDB} ${LIBKRB5} ${LIBDES} ${LIBASN1} ${LIBCRYPTO} \ ${LIBCOM_ERR} ${LIBUTIL} -LDADD+= -lhdb -lkrb5 -lkrb -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err -lutil +LDADD+= -lhdb -lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto \ + -lcom_err -lutil .include <bsd.prog.mk> diff --git a/kerberosV/usr.sbin/ktutil/Makefile b/kerberosV/usr.sbin/ktutil/Makefile index d9fecf08070..6b8a79bdb15 100644 --- a/kerberosV/usr.sbin/ktutil/Makefile +++ b/kerberosV/usr.sbin/ktutil/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2003/04/07 21:31:45 hin Exp $ +# $OpenBSD: Makefile,v 1.9 2003/05/14 07:18:27 mho Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -14,14 +14,15 @@ SRCS= add.c \ list.c \ purge.c \ remove.c \ - rename.c + rename.c \ + sl.c .PATH: ${KRB5SRC}/admin +.PATH: ${KRB5SRC}/lib/sl CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 -DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBKRB} ${LIBHDB} ${LIBADM5SRV} \ - ${LIBKADM5CLNT} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR} \ - ${LIBKAFS} ${LIBDES} -LDADD+= ${LIBSL} -lreadline -lcurses -lkrb -lhdb -lkadm5clnt \ - -lhdb -lkrb5 ${LIBROKEN} -lasn1 -lcrypto -lcom_err -lkafs -ldes +DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBKADM5CLNT} ${LIBHDB} \ + ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBDES} +LDADD+= -lreadline -lcurses -lkadm5clnt -lhdb \ + -lkrb5 ${LIBROKEN} -lasn1 -lcrypto -lcom_err -ldes .include <bsd.prog.mk> diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index 83af505603a..31059b8234c 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2002/05/08 19:41:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.27 2003/05/14 07:22:47 mho Exp $ .include <bsd.own.mk> @@ -17,18 +17,12 @@ CFLAGS+=-DYP -I${.CURDIR}/../../lib/libc/yp .include <bsd.own.mk> # For Kerberos .if (${KERBEROS5:L} == "yes") +.PATH: ${.CURDIR}/../rsh +SRCS+= krb_passwd.c des_rw.c SRCS+= krb5_passwd.c CFLAGS+= -DKRB5 -DPADD+= ${LIBKRB5} ${LIBASN1} -LDADD+= -lkrb5 -lasn1 -.endif - -.if (${KERBEROS:L} == "yes") -.PATH: ${.CURDIR}/../rsh -SRCS+= new_pwd.c krb_passwd.c des_rw.c -CFLAGS+= -DKERBEROS -DPADD+= ${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCOMERR} ${LIBKAFS} ${LIBCRYPTO} -LDADD+= -lkadm -lkrb -ldes -lcom_err -lkafs -lcrypto +DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBDES} ${LIBCOM_ERR} ${LIBCRYPTO} +LDADD+= -lkrb5 -lasn1 -ldes -lcom_err -lcrypto .endif BINMODE=4555 |