summaryrefslogtreecommitdiffstats
path: root/kerberos5
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2003-03-09 21:56:55 +0000
committermarkm <markm@FreeBSD.org>2003-03-09 21:56:55 +0000
commit2abe88edc138f2f3133b9137f8f8ea1f6538d0d1 (patch)
tree6557f4e3c58b45ff66d349c451529958a6090b7e /kerberos5
parente784833e45f860b5dd501b0e7ad1de3a7817f980 (diff)
downloadFreeBSD-src-2abe88edc138f2f3133b9137f8f8ea1f6538d0d1.zip
FreeBSD-src-2abe88edc138f2f3133b9137f8f8ea1f6538d0d1.tar.gz
Post KerberosIV de-orbit: Clean up Kerberos5. We dont need KerberosIV
compatiblity mode anymore. Rename the k5foo utils to kfoo (after repo-copy).
Diffstat (limited to 'kerberos5')
-rw-r--r--kerberos5/Makefile.inc14
-rw-r--r--kerberos5/include/version.h2
-rw-r--r--kerberos5/lib/Makefile7
-rw-r--r--kerberos5/lib/libkafs5/Makefile15
-rw-r--r--kerberos5/lib/libkrb5/Makefile3
-rw-r--r--kerberos5/lib/libtelnet/Makefile4
-rw-r--r--kerberos5/libexec/Makefile2
-rw-r--r--kerberos5/libexec/hprop/Makefile7
-rw-r--r--kerberos5/libexec/hpropd/Makefile7
-rw-r--r--kerberos5/libexec/ipropd-master/Makefile7
-rw-r--r--kerberos5/libexec/ipropd-slave/Makefile7
-rw-r--r--kerberos5/libexec/k5admind/Makefile51
-rw-r--r--kerberos5/libexec/k5passwdd/Makefile43
-rw-r--r--kerberos5/libexec/kadmind/Makefile10
-rw-r--r--kerberos5/libexec/kdc/Makefile12
-rw-r--r--kerberos5/libexec/kpasswdd/Makefile9
-rw-r--r--kerberos5/libexec/telnetd/Makefile12
-rw-r--r--kerberos5/usr.bin/Makefile2
-rw-r--r--kerberos5/usr.bin/k5admin/Makefile74
-rw-r--r--kerberos5/usr.bin/k5destroy/Makefile30
-rw-r--r--kerberos5/usr.bin/k5init/Makefile31
-rw-r--r--kerberos5/usr.bin/k5list/Makefile30
-rw-r--r--kerberos5/usr.bin/k5passwd/Makefile28
-rw-r--r--kerberos5/usr.bin/k5su/Makefile32
-rw-r--r--kerberos5/usr.bin/kadmin/Makefile16
-rw-r--r--kerberos5/usr.bin/kdestroy/Makefile12
-rw-r--r--kerberos5/usr.bin/kinit/Makefile12
-rw-r--r--kerberos5/usr.bin/klist/Makefile12
-rw-r--r--kerberos5/usr.bin/kpasswd/Makefile12
-rw-r--r--kerberos5/usr.bin/ksu/Makefile9
-rw-r--r--kerberos5/usr.bin/telnet/Makefile12
-rw-r--r--kerberos5/usr.sbin/Makefile2
-rw-r--r--kerberos5/usr.sbin/k5stash/Makefile30
-rw-r--r--kerberos5/usr.sbin/kstash/Makefile9
-rw-r--r--kerberos5/usr.sbin/ktutil/Makefile7
35 files changed, 38 insertions, 534 deletions
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index b90b2f6..2b44215 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -5,16 +5,11 @@ NOLINT= true
.if !defined(INCLUDEOBJDIR)
-KRB4DIR= ${.CURDIR}/../../../crypto/kerberosIV
KRB5DIR= ${.CURDIR}/../../../crypto/heimdal
ROKENDIR= ${.CURDIR}/../../lib/libroken
TELNETDIR= ${.CURDIR}/../../../crypto/telnet
-CFLAGS+=-Wall -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
-
-.if defined(MAKE_KERBEROS4)
-CFLAGS+=-DKRB5_KRB4_COMPAT -DKRB4
-.endif
+CFLAGS+=-I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
CFLAGS+=-DINET6
@@ -48,12 +43,6 @@ VERSOBJDIR= ${.OBJDIR}/../../lib/libvers
VERSOBJDIR= ${.CURDIR}/../../lib/libvers
.endif
-.if exists(${.OBJDIR}/../../lib/libkrb4)
-KRB4OBJDIR= ${.OBJDIR}/../../lib/libkrb4
-.else
-KRB4OBJDIR= ${.CURDIR}/../../lib/libkrb4
-.endif
-
.if exists(${.OBJDIR}/../../lib/libkrb5)
KRB5OBJDIR= ${.OBJDIR}/../../lib/libkrb5
.else
@@ -160,7 +149,6 @@ CLEANFILES+= make-roken.c make-roken roken.h
.else
-KRB4DIR= ${.CURDIR}/../../crypto/kerberosIV
KRB5DIR= ${.CURDIR}/../../crypto/heimdal
ROKENDIR= ${.CURDIR}/../../lib/libroken
diff --git a/kerberos5/include/version.h b/kerberos5/include/version.h
index 015e8e9..a5ec15f 100644
--- a/kerberos5/include/version.h
+++ b/kerberos5/include/version.h
@@ -1,5 +1,3 @@
/* $FreeBSD$ */
-const char *krb4_long_version = "@(#)$Version: krb4-1.0.5fb1 (FreeBSD) $";
-const char *krb4_version = "krb4-1.0.5fb1";
const char *heimdal_long_version = "@(#)$Version: Heimdal 0.5.1 (FreeBSD) $";
const char *heimdal_version = "Heimdal 0.5.1";
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index f34d30e..f94bb0a 100644
--- a/kerberos5/lib/Makefile
+++ b/kerberos5/lib/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-SUBDIR= libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi
-.if defined(MAKE_KERBEROS4)
-SUBDIR+=libkafs5
-.endif
-SUBDIR+=libtelnet
+SUBDIR= libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi libtelnet
+
.include <bsd.subdir.mk>
diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile
deleted file mode 100644
index 782800a..0000000
--- a/kerberos5/lib/libkafs5/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-LIB= kafs5
-CFLAGS+=-I${KRB5DIR}/lib/kafs \
- -I${KRB5DIR}/lib/asn1 \
- -I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/include \
- -I${KRB5OBJDIR} \
- -I${ASN1OBJDIR}
-SRCS= afssys.c afskrb5.c common.c
-
-.include <bsd.lib.mk>
-
-.PATH: ${KRB5DIR}/lib/kafs
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index cc6a10f..63b62c0 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -8,9 +8,6 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/include \
-I${KRB5OBJDIR} \
-I${ASN1OBJDIR}
-.if defined(MAKE_KERBEROS4)
-CFLAGS+=-I${KRB4DIR}/include
-.endif
SRCS= \
acl.c \
add_et_list.c \
diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile
index c5ef16e..223df03 100644
--- a/kerberos5/lib/libtelnet/Makefile
+++ b/kerberos5/lib/libtelnet/Makefile
@@ -6,10 +6,6 @@ INTERNALLIB= yes
SRCS= genget.c getent.c misc.c encrypt.c auth.c \
enc_des.c sra.c pk.c
-.if defined(MAKE_KERBEROS4)
-SRCS+= kerberos.c
-CFLAGS+= -DKRB4 -I${KRB4DIR}/lib/krb
-.endif
SRCS+= kerberos5.c
#WARNS?= 2
diff --git a/kerberos5/libexec/Makefile b/kerberos5/libexec/Makefile
index c1f685e..b81f769 100644
--- a/kerberos5/libexec/Makefile
+++ b/kerberos5/libexec/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-SUBDIR= ipropd-master ipropd-slave hpropd k5admind kdc k5passwdd telnetd
+SUBDIR= ipropd-master ipropd-slave hpropd kadmind kdc kpasswdd telnetd
.include <bsd.subdir.mk>
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index a49f27b..20db261 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -12,16 +12,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs -lkdb
-_krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB}
-.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
MAN= hprop.8
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index abbbbbf..0b98752 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -12,16 +12,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs -lkdb
-_krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB}
-.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
MAN= hpropd.8
diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile
index 8b55173..f77b54e 100644
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -12,18 +12,13 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
LDADD= \
-L${KADM5SOBJDIR} -lkadm5srv \
-L${KRB5OBJDIR} -lkrb5 \
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index ab4b2c7..0614f5a 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -12,18 +12,13 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
LDADD= \
-L${KADM5SOBJDIR} -lkadm5srv \
-L${KRB5OBJDIR} -lkrb5 \
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
diff --git a/kerberos5/libexec/k5admind/Makefile b/kerberos5/libexec/k5admind/Makefile
deleted file mode 100644
index 70beef6..0000000
--- a/kerberos5/libexec/k5admind/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $FreeBSD$
-
-PROG= k5admind
-SRCS= kadmind.c server.c kadm_conn.c \
- kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
-CFLAGS+= -I${KRB5DIR}/include \
- -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/lib/asn1 \
- -I${KRB5DIR}/lib/hdb \
- -I${KRB5DIR}/lib/sl \
- -I${KRB5DIR}/lib/kadm5 \
- -I${KRB5DIR}/kadmin \
- -I${ASN1OBJDIR} \
- -I${HDBOBJDIR} \
- -I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-SRCS+= version4.c
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
-LDADD= -L${KRB5OBJDIR} -lkrb5 \
- -L${ROKENOBJDIR} -lroken \
- -L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
- -L${KADM5SOBJDIR} -lkadm5srv \
- -L${HDBOBJDIR} -lhdb \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-NOMAN= yes
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kadmin
-
-kadm5/private.h: kadm5
- cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
-
-kadm5/admin.h: kadm5
- cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
-
-kadm5/kadm5_err.h: kadm5 kadm5_err.h
- cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
-
-kadm5:
- mkdir ${.TARGET}
-
-CLEANFILES+= kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
-CLEANDIRS+= kadm5
diff --git a/kerberos5/libexec/k5passwdd/Makefile b/kerberos5/libexec/k5passwdd/Makefile
deleted file mode 100644
index 3b53959..0000000
--- a/kerberos5/libexec/k5passwdd/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $FreeBSD$
-
-PROG= k5passwdd
-SRCS= kpasswdd.c krb5_err.h heim_err.h hdb_err.h \
- kadm5/admin.h kadm5/private.h
-CFLAGS+= -I${KRB5DIR}/include \
- -I${KRB5DIR}/lib/asn1 \
- -I${KRB5DIR}/lib/hdb \
- -I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/lib/kadm5 \
- -I${KRB5DIR}/kpasswd \
- -I${ASN1OBJDIR} \
- -I${HDBOBJDIR} \
- -I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
-LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \
- -L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
- -L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-MAN= kpasswdd.8
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kpasswd
-
-kadm5/admin.h: kadm5
- cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
-
-kadm5/private.h: kadm5
- cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
-
-kadm5:
- mkdir ${.TARGET}
-
-CLEANFILES+= kadm5/admin.h kadm5/private.h
-CLEANDIRS+= kadm5
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index 70beef6..46ca5d5 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= k5admind
+PROG= kadmind
SRCS= kadmind.c server.c kadm_conn.c \
kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
CFLAGS+= -I${KRB5DIR}/include \
@@ -14,19 +14,13 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-SRCS+= version4.c
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index ecf601e..ac0d3ba 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-PROG= kdc
-SRCS= \
+PROG= kdc
+SRCS= \
config.c \
connect.c \
kdc_locl.h \
@@ -20,17 +20,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-SRCS+= 524.c kerberos4.c kaserver.c rx.h
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
MAN= kdc.8
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index 3b53959..faae574 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= k5passwdd
+PROG= kpasswdd
SRCS= kpasswdd.c krb5_err.h heim_err.h hdb_err.h \
kadm5/admin.h kadm5/private.h
CFLAGS+= -I${KRB5DIR}/include \
@@ -13,16 +13,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBROKEN} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
MAN= kpasswdd.8
diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile
index 9b12a00..8ea60d4 100644
--- a/kerberos5/libexec/telnetd/Makefile
+++ b/kerberos5/libexec/telnetd/Makefile
@@ -16,18 +16,10 @@ CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write
WARNS?= 2
-DPADD=
-LDADD=
-
-.if defined(MAKE_KERBEROS4)
-DPADD+= ${LIBKRB} ${LIBCOM_ERR}
-LDADD+= -lkrb -lcom_err
-.endif
-
-DPADD+= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
+DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} \
${LIBCRYPT} ${LIBPAM}
-LDADD+= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
+LDADD= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
-L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 \
-L${ROKENOBJDIR} -lroken -lcom_err \
-lcrypt ${MINUSLPAM}
diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index ab1b9d5..89c7503 100644
--- a/kerberos5/usr.bin/Makefile
+++ b/kerberos5/usr.bin/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-SUBDIR= k5admin k5destroy k5init k5list k5passwd k5su krb5-config telnet
+SUBDIR= kadmin kdestroy kinit klist kpasswd ksu krb5-config telnet
.include <bsd.subdir.mk>
diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile
deleted file mode 100644
index 04ae169..0000000
--- a/kerberos5/usr.bin/k5admin/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# $FreeBSD$
-
-PROG= k5admin
-SRCS= \
- ank.c \
- cpw.c \
- del.c \
- del_enctype.c \
- dump.c \
- ext.c \
- get.c \
- init.c \
- kadmin.c \
- load.c \
- mod.c \
- rename.c \
- util.c \
- random_password.c \
- kadmin_locl.h \
- krb5_err.h heim_err.h hdb_err.h \
- kadm5/private.h \
- kadm5/admin.h \
- kadm5/kadm5_err.h
-
-CFLAGS+= -I${KRB5DIR}/include \
- -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/lib/asn1 \
- -I${KRB5DIR}/lib/hdb \
- -I${KRB5DIR}/lib/sl \
- -I${KRB5DIR}/lib/kadm5 \
- -I${KRB5DIR}/kadmin \
- -I${ASN1OBJDIR} \
- -I${HDBOBJDIR} \
- -I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
-LDADD= -L${KRB5OBJDIR} -lkrb5 \
- -L${ROKENOBJDIR} -lroken \
- -L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
- -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
- -L${HDBOBJDIR} -lhdb \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err \
- -L${SLOBJDIR} -lsl -lreadline
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
- ${LIBSL} ${LIBREADLINE}
-MAN= k5admin.8
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kadmin
-
-kadm5/private.h: kadm5
- cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
-
-kadm5/admin.h: kadm5
- cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
-
-kadm5/kadm5_err.h: kadm5 kadm5_err.h
- cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
-
-kadm5:
- mkdir ${.TARGET}
-
-k5admin.8: kadmin.8
- ln -sf ${.OODATE} ${.TARGET}
-
-CLEANFILES+= kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
-CLEANDIRS+= kadm5
diff --git a/kerberos5/usr.bin/k5destroy/Makefile b/kerberos5/usr.bin/k5destroy/Makefile
deleted file mode 100644
index 42717c6..0000000
--- a/kerberos5/usr.bin/k5destroy/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-PROG= k5destroy
-SRCS= kdestroy.c krb5_err.h heim_err.h k524_err.h
-CFLAGS+= -I${KRB5DIR}/include \
- -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/lib/kafs \
- -I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/lib/asn1 \
- -I${KRB5DIR}/kuser \
- -I${ASN1OBJDIR} \
- -I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
-LDADD= -L${KRB5OBJDIR} -lkrb5 \
- -L${ROKENOBJDIR} -lroken \
- -L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kuser
-
-k5destroy.1: kdestroy.1
- ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/k5init/Makefile b/kerberos5/usr.bin/k5init/Makefile
deleted file mode 100644
index 3f2ec42..0000000
--- a/kerberos5/usr.bin/k5init/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $FreeBSD$
-
-PROG= k5init
-SRCS= kinit.c asn1_err.h krb5_err.h heim_err.h \
- k524_err.h
-CFLAGS+= -I${KRB5DIR}/include \
- -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/lib/kafs \
- -I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/lib/asn1 \
- -I${KRB5DIR}/kuser \
- -I${ASN1OBJDIR} \
- -I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs
-_krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
-.endif
-LDADD= -L${KRB5OBJDIR} -lkrb5 \
- -L${ROKENOBJDIR} -lroken \
- -L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kuser
-
-k5init.1: kinit.1
- ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/k5list/Makefile b/kerberos5/usr.bin/k5list/Makefile
deleted file mode 100644
index f73528b..0000000
--- a/kerberos5/usr.bin/k5list/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-PROG= k5list
-SRCS= klist.c krb5_err.h heim_err.h k524_err.h
-CFLAGS+= -I${KRB5DIR}/include \
- -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/lib/kafs \
- -I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/lib/asn1 \
- -I${KRB5DIR}/kuser \
- -I${ASN1OBJDIR} \
- -I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
-LDADD= -L${KRB5OBJDIR} -lkrb5 \
- -L${ROKENOBJDIR} -lroken \
- -L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kuser
-
-k5list.1: klist.1
- ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/k5passwd/Makefile b/kerberos5/usr.bin/k5passwd/Makefile
deleted file mode 100644
index de6316a..0000000
--- a/kerberos5/usr.bin/k5passwd/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $FreeBSD$
-
-PROG= k5passwd
-SRCS= kpasswd.c krb5_err.h heim_err.h k524_err.h
-CFLAGS+= -I${KRB5DIR}/include \
- -I${KRB5DIR}/lib/asn1 \
- -I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/kpasswd \
- -I${ASN1OBJDIR} \
- -I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
-LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \
- -L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kpasswd
-
-k5passwd.1: kpasswd.1
- ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/k5su/Makefile b/kerberos5/usr.bin/k5su/Makefile
deleted file mode 100644
index 47339ad..0000000
--- a/kerberos5/usr.bin/k5su/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $FreeBSD$
-
-PROG= k5su
-SRCS= su.c asn1_err.h krb5_err.h heim_err.h k524_err.h
-CFLAGS+= -I${KRB5DIR}/include \
- -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/lib/kafs \
- -I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/lib/asn1 \
- -I${KRB5DIR}/kuser \
- -I${ASN1OBJDIR} \
- -I${.OBJDIR}
-NOMAN= true
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -L${KAFS5OBJDIR} -lkafs -lkrb -lkafs5
-_krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
-.endif
-LDADD= -L${KRB5OBJDIR} -lkrb5 \
- -L${ROKENOBJDIR} -lroken \
- -L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-.if defined(ENABLE_SUID_K5SU)
-BINMODE=4555
-.endif
-INSTALLFLAGS=-fschg
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/appl/su
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index 04ae169..fc72b3d 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-PROG= k5admin
-SRCS= \
+PROG= kadmin
+SRCS= \
ank.c \
cpw.c \
del.c \
@@ -33,23 +33,18 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err \
-L${SLOBJDIR} -lsl -lreadline
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
${LIBSL} ${LIBREADLINE}
-MAN= k5admin.8
+MAN= kadmin.8
.include <bsd.prog.mk>
@@ -67,8 +62,5 @@ kadm5/kadm5_err.h: kadm5 kadm5_err.h
kadm5:
mkdir ${.TARGET}
-k5admin.8: kadmin.8
- ln -sf ${.OODATE} ${.TARGET}
-
CLEANFILES+= kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
CLEANDIRS+= kadm5
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index 42717c6..51233ea 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= k5destroy
+PROG= kdestroy
SRCS= kdestroy.c krb5_err.h heim_err.h k524_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
@@ -10,21 +10,13 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/kuser
-
-k5destroy.1: kdestroy.1
- ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
index 3f2ec42..2d2f780 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= k5init
+PROG= kinit
SRCS= kinit.c asn1_err.h krb5_err.h heim_err.h \
k524_err.h
CFLAGS+= -I${KRB5DIR}/include \
@@ -11,21 +11,13 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs
-_krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
-.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/kuser
-
-k5init.1: kinit.1
- ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile
index f73528b..d1db57c 100644
--- a/kerberos5/usr.bin/klist/Makefile
+++ b/kerberos5/usr.bin/klist/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= k5list
+PROG= klist
SRCS= klist.c krb5_err.h heim_err.h k524_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
@@ -10,21 +10,13 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/kuser
-
-k5list.1: klist.1
- ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile
index de6316a..20b0913 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= k5passwd
+PROG= kpasswd
SRCS= kpasswd.c krb5_err.h heim_err.h k524_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/asn1 \
@@ -9,20 +9,12 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/kpasswd \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBROKEN} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/kpasswd
-
-k5passwd.1: kpasswd.1
- ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
index 47339ad..50699e2 100644
--- a/kerberos5/usr.bin/ksu/Makefile
+++ b/kerberos5/usr.bin/ksu/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= k5su
+PROG= ksu
SRCS= su.c asn1_err.h krb5_err.h heim_err.h k524_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
@@ -11,16 +11,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
NOMAN= true
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -L${KAFS5OBJDIR} -lkafs -lkrb -lkafs5
-_krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
-.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
.if defined(ENABLE_SUID_K5SU)
BINMODE=4555
diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile
index 00d5f11..01566bb 100644
--- a/kerberos5/usr.bin/telnet/Makefile
+++ b/kerberos5/usr.bin/telnet/Makefile
@@ -13,18 +13,10 @@ CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write
WARNS?= 2
-DPADD=
-LDADD=
-
-.if defined(MAKE_KERBEROS4)
-DPADD+= ${LIBKRB} ${LIBCOM_ERR}
-LDADD+= -lkrb -lcom_err
-.endif
-
-DPADD+= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
+DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \
${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
-LDADD+= -ltermcap ${LIBTELNET} -lmp \
+LDADD= -ltermcap ${LIBTELNET} -lmp \
-L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 -lcom_err \
-L${ROKENOBJDIR} -lroken \
-lcrypto -lcrypt -lipsec ${MINUSLPAM}
diff --git a/kerberos5/usr.sbin/Makefile b/kerberos5/usr.sbin/Makefile
index 45e4fa5..2e722ee 100644
--- a/kerberos5/usr.sbin/Makefile
+++ b/kerberos5/usr.sbin/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-SUBDIR= k5stash ktutil
+SUBDIR= kstash ktutil
.include <bsd.subdir.mk>
diff --git a/kerberos5/usr.sbin/k5stash/Makefile b/kerberos5/usr.sbin/k5stash/Makefile
deleted file mode 100644
index b6abde7..0000000
--- a/kerberos5/usr.sbin/k5stash/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-PROG= k5stash
-SRCS= kstash.c hdb_err.h
-CFLAGS+= -I${KRB5DIR}/include \
- -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/lib/asn1 \
- -I${KRB5DIR}/lib/hdb \
- -I${KRB5DIR}/kdc \
- -I${ASN1OBJDIR} \
- -I${HDBOBJDIR} \
- -I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
-LDADD= -L${HDBOBJDIR} -lhdb \
- -L${KRB5OBJDIR} -lkrb5 \
- -L${ROKENOBJDIR} -lroken \
- -L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-MAN= kstash.8
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kdc
diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile
index b6abde7..cb5a7cc 100644
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= k5stash
+PROG= kstash
SRCS= kstash.c hdb_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
@@ -11,17 +11,12 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
LDADD= -L${HDBOBJDIR} -lhdb \
-L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
MAN= kstash.8
diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile
index a07663e..6d8b27a 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile
+++ b/kerberos5/usr.sbin/ktutil/Makefile
@@ -25,18 +25,13 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/admin \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- ${_krb4libs} \
-L${SLOBJDIR} -lsl -L${ASN1OBJDIR} -lasn1 \
-L${KADM5COBJDIR} -lkadm5clnt \
-lcrypto -lcrypt -lcom_err -lreadline
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
${LIBSL} ${LIBASN1} ${LIBKADM5CLNT} \
${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE}
MAN= ktutil.8
OpenPOWER on IntegriCloud