summaryrefslogtreecommitdiffstats
path: root/kerberos5
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2000-02-28 19:15:32 +0000
committermarkm <markm@FreeBSD.org>2000-02-28 19:15:32 +0000
commit5dffca5013c0de6e26b8856753725a833d02a04a (patch)
tree5368efeae9834c3c39f215909a745290ce92165f /kerberos5
parent37dce23afc624dfc2ebae4614ddd17d5e376a901 (diff)
downloadFreeBSD-src-5dffca5013c0de6e26b8856753725a833d02a04a.zip
FreeBSD-src-5dffca5013c0de6e26b8856753725a833d02a04a.tar.gz
Remove largescale evidence of crack-smoking.
Where a k4 applet has a k5 namesake, rename the k5 version from k<app> to k5<app>. (Repo copy done). Do some repairs to dependancies to support make world properly.
Diffstat (limited to 'kerberos5')
-rw-r--r--kerberos5/Makefile.inc2
-rw-r--r--kerberos5/lib/libasn1/Makefile6
-rw-r--r--kerberos5/lib/libhdb/Makefile4
-rw-r--r--kerberos5/lib/libkrb5/Makefile4
-rw-r--r--kerberos5/lib/libroken/Makefile4
-rw-r--r--kerberos5/lib/libsl/Makefile4
-rw-r--r--kerberos5/libexec/Makefile2
-rw-r--r--kerberos5/libexec/k5admind/Makefile2
-rw-r--r--kerberos5/libexec/k5passwdd/Makefile2
-rw-r--r--kerberos5/libexec/kadmind/Makefile2
-rw-r--r--kerberos5/libexec/kpasswdd/Makefile2
-rw-r--r--kerberos5/usr.bin/Makefile2
-rw-r--r--kerberos5/usr.bin/k5admin/Makefile2
-rw-r--r--kerberos5/usr.bin/k5auth/Makefile2
-rw-r--r--kerberos5/usr.bin/k5destroy/Makefile5
-rw-r--r--kerberos5/usr.bin/k5init/Makefile5
-rw-r--r--kerberos5/usr.bin/k5list/Makefile5
-rw-r--r--kerberos5/usr.bin/k5passwd/Makefile5
-rw-r--r--kerberos5/usr.bin/kadmin/Makefile2
-rw-r--r--kerberos5/usr.bin/kauth/Makefile22
-rw-r--r--kerberos5/usr.bin/kdestroy/Makefile5
-rw-r--r--kerberos5/usr.bin/kinit/Makefile5
-rw-r--r--kerberos5/usr.bin/klist/Makefile5
-rw-r--r--kerberos5/usr.bin/kpasswd/Makefile5
-rw-r--r--kerberos5/usr.sbin/Makefile2
-rw-r--r--kerberos5/usr.sbin/k5admin/Makefile50
-rw-r--r--kerberos5/usr.sbin/k5stash/Makefile2
-rw-r--r--kerberos5/usr.sbin/kadmin/Makefile50
-rw-r--r--kerberos5/usr.sbin/kstash/Makefile2
29 files changed, 62 insertions, 148 deletions
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 6da967b..bd226bd 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -133,7 +133,7 @@ CLEANFILES+=kadm5_err.h kadm5_err.c kadm5_err.et
beforeinstall: ${INCLUDES}
.for INC in ${INCLUDES}
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${INC} ${DESTDIR}/usr/include/${INC}
+ ${INC} ${DESTDIR}/usr/include
.endfor
.endif
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index 5a2a5a1..a8a196e 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -27,11 +27,15 @@ GEN= asn1_APOptions.x asn1_AP_REP.x asn1_AP_REQ.x asn1_AS_REP.x \
asn1_TGS_REQ.x asn1_Ticket.x asn1_TicketFlags.x \
asn1_TransitedEncoding.x
+INCLUDES=asn1.h asn1_err.h
+
.include <bsd.lib.mk>
.PATH: ${KRB5DIR}/lib/asn1
.PATH: ${KRB5DIR}/lib/roken
+build-tools: make-print-version asn1_compile
+
beforedepend all: roken.h
.for I in ${GEN}
@@ -68,7 +72,7 @@ print_version.h: make-print-version
./make-print-version print_version.h
make-print-version: make-print-version.c
- ${CC} ${CFLAGS} -o ${.TARGET} ${.OODATE}
+ ${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}
CLEANFILES+= ${GEN} asn1_compile lex.o parse.o parse.c parse.h \
hdb_asn1.h make-print-version print_version.h print_version.o
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index a826231..354239e 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -19,6 +19,8 @@ GEN= asn1_Key.x asn1_Event.x asn1_HDBFlags.x asn1_hdb_entry.x asn1_Salt.x
.PATH: ${KRB5DIR}/lib/asn1
.PATH: ${KRB5DIR}/lib/roken
+build-tools: make-print-version asn1_compile
+
.for I in ${GEN}
${I:S/.x/.c/}: ${I}
cmp -s ${.OODATE} ${.TARGET} 2> /dev/null || cp ${.OODATE} ${.TARGET}
@@ -51,7 +53,7 @@ print_version.h: make-print-version
./make-print-version print_version.h
make-print-version: make-print-version.c
- ${CC} ${CFLAGS} -o ${.TARGET} ${.OODATE}
+ ${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}
CLEANFILES+= ${GEN} asn1_compile lex.o parse.o parse.c parse.h \
hdb_asn1.h make-print-version print_version.h print_version.o
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index a12819c..59469d8 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -30,7 +30,9 @@ SRCS= add_et_list.c addr_families.c address.c aname_to_localname.c \
verify_init.c verify_user.c version.c warn.c write_message.c \
krb5_err.c krb5_err.h heim_err.c heim_err.h \
rc4_enc.c rc4_skey.c
-INCLUDES=krb5.h
+
+INCLUDES=${KRB5DIR}/lib/krb5/krb5.h ${.CURDIR}/../../include/krb5-types.h \
+ ${KRB5DIR}/lib/krb5/krb5-protos.h heim_err.h krb5_err.h
.include <bsd.lib.mk>
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index 8430907..849d701 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -25,12 +25,12 @@ beforedepend all: print_version.h
.PATH: ${KRB5DIR}/lib/roken
-build-tools: make-print-version
+build-tools: make-print-version make-roken
print_version.h: make-print-version
./make-print-version print_version.h
make-print-version: make-print-version.c
- ${CC} ${CFLAGS} -o ${.TARGET} ${.OODATE}
+ ${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}
CLEANFILES+= make-print-version print_version.h
diff --git a/kerberos5/lib/libsl/Makefile b/kerberos5/lib/libsl/Makefile
index 0bcd739..f976548 100644
--- a/kerberos5/lib/libsl/Makefile
+++ b/kerberos5/lib/libsl/Makefile
@@ -11,6 +11,10 @@ NOPIC= yes
install:
+beforeinstall:
+
.include <bsd.lib.mk>
.PATH: ${KRB5DIR}/lib/sl
+
+build-tools: make-roken
diff --git a/kerberos5/libexec/Makefile b/kerberos5/libexec/Makefile
index adaa8cd..5efa736 100644
--- a/kerberos5/libexec/Makefile
+++ b/kerberos5/libexec/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-SUBDIR= ipropd-master ipropd-slave hpropd kadmind kdc kpasswdd
+SUBDIR= ipropd-master ipropd-slave hpropd k5admind kdc k5passwdd
.include <bsd.subdir.mk>
diff --git a/kerberos5/libexec/k5admind/Makefile b/kerberos5/libexec/k5admind/Makefile
index 5ec1881..7e55664 100644
--- a/kerberos5/libexec/k5admind/Makefile
+++ b/kerberos5/libexec/k5admind/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kadmind
+PROG= k5admind
SRCS= kadmind.c server.c version4.c \
kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
CFLAGS+= -I${KRB5DIR}/include \
diff --git a/kerberos5/libexec/k5passwdd/Makefile b/kerberos5/libexec/k5passwdd/Makefile
index 7fc304a..b15f95d 100644
--- a/kerberos5/libexec/k5passwdd/Makefile
+++ b/kerberos5/libexec/k5passwdd/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kpasswdd
+PROG= k5passwdd
SRCS= kpasswdd.c krb5_err.h heim_err.h hdb_err.h kadm5/admin.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/asn1 \
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index 5ec1881..7e55664 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kadmind
+PROG= k5admind
SRCS= kadmind.c server.c version4.c \
kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
CFLAGS+= -I${KRB5DIR}/include \
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index 7fc304a..b15f95d 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kpasswdd
+PROG= k5passwdd
SRCS= kpasswdd.c krb5_err.h heim_err.h hdb_err.h kadm5/admin.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/asn1 \
diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index 4a0d3f3..ec85d88 100644
--- a/kerberos5/usr.bin/Makefile
+++ b/kerberos5/usr.bin/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-SUBDIR= kadmin kauth kdestroy kinit klist kpasswd
+SUBDIR= k5admin k5auth k5destroy k5init k5list k5passwd
.include <bsd.subdir.mk>
diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile
index 8e247eb..04bbfbb 100644
--- a/kerberos5/usr.bin/k5admin/Makefile
+++ b/kerberos5/usr.bin/k5admin/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kadmin
+PROG= k5admin
SRCS= kadmin.c ank.c cpw.c del.c del_enctype.c get.c rename.c util.c \
ext.c mod.c init.c dump.c load.c random_password.c \
krb5_err.h heim_err.h hdb_err.h \
diff --git a/kerberos5/usr.bin/k5auth/Makefile b/kerberos5/usr.bin/k5auth/Makefile
index dbec434..36e8426 100644
--- a/kerberos5/usr.bin/k5auth/Makefile
+++ b/kerberos5/usr.bin/k5auth/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kauth
+PROG= k5auth
SRCS= kauth.c rkinit.c encdata.c marshall.c roken.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
diff --git a/kerberos5/usr.bin/k5destroy/Makefile b/kerberos5/usr.bin/k5destroy/Makefile
index 797005d..607d4c4 100644
--- a/kerberos5/usr.bin/k5destroy/Makefile
+++ b/kerberos5/usr.bin/k5destroy/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kdestroy
+PROG= k5destroy
SRCS= kdestroy.c krb5_err.h heim_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
@@ -22,3 +22,6 @@ DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
.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
index 8618f35..824b3a3 100644
--- a/kerberos5/usr.bin/k5init/Makefile
+++ b/kerberos5/usr.bin/k5init/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kinit
+PROG= k5init
SRCS= kinit.c kinit_options.c asn1_err.h krb5_err.h heim_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
@@ -22,3 +22,6 @@ DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
.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
index e40949d..b3798f4 100644
--- a/kerberos5/usr.bin/k5list/Makefile
+++ b/kerberos5/usr.bin/k5list/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= klist
+PROG= k5list
SRCS= klist.c krb5_err.h heim_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
@@ -22,3 +22,6 @@ DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
.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
index 298645b..9bd3e2d 100644
--- a/kerberos5/usr.bin/k5passwd/Makefile
+++ b/kerberos5/usr.bin/k5passwd/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kpasswd
+PROG= k5passwd
SRCS= kpasswd.c krb5_err.h heim_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/asn1 \
@@ -21,3 +21,6 @@ DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/kpasswd
+
+k5passwd.1: kpasswd.1
+ ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index 8e247eb..04bbfbb 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kadmin
+PROG= k5admin
SRCS= kadmin.c ank.c cpw.c del.c del_enctype.c get.c rename.c util.c \
ext.c mod.c init.c dump.c load.c random_password.c \
krb5_err.h heim_err.h hdb_err.h \
diff --git a/kerberos5/usr.bin/kauth/Makefile b/kerberos5/usr.bin/kauth/Makefile
deleted file mode 100644
index dbec434..0000000
--- a/kerberos5/usr.bin/kauth/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD$
-
-PROG= kauth
-SRCS= kauth.c rkinit.c encdata.c marshall.c roken.h
-CFLAGS+= -I${KRB5DIR}/include \
- -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/appl/kauth \
- -I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
-LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
-DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
-NOMAN= yes
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/appl/kauth
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index 797005d..607d4c4 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kdestroy
+PROG= k5destroy
SRCS= kdestroy.c krb5_err.h heim_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
@@ -22,3 +22,6 @@ DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
.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 8618f35..824b3a3 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kinit
+PROG= k5init
SRCS= kinit.c kinit_options.c asn1_err.h krb5_err.h heim_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
@@ -22,3 +22,6 @@ DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
.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 e40949d..b3798f4 100644
--- a/kerberos5/usr.bin/klist/Makefile
+++ b/kerberos5/usr.bin/klist/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= klist
+PROG= k5list
SRCS= klist.c krb5_err.h heim_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
@@ -22,3 +22,6 @@ DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
.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 298645b..9bd3e2d 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kpasswd
+PROG= k5passwd
SRCS= kpasswd.c krb5_err.h heim_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/asn1 \
@@ -21,3 +21,6 @@ DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/kpasswd
+
+k5passwd.1: kpasswd.1
+ ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.sbin/Makefile b/kerberos5/usr.sbin/Makefile
index a9acbe0..45e4fa5 100644
--- a/kerberos5/usr.sbin/Makefile
+++ b/kerberos5/usr.sbin/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-SUBDIR= kadmin kstash ktutil
+SUBDIR= k5stash ktutil
.include <bsd.subdir.mk>
diff --git a/kerberos5/usr.sbin/k5admin/Makefile b/kerberos5/usr.sbin/k5admin/Makefile
deleted file mode 100644
index efb6211..0000000
--- a/kerberos5/usr.sbin/k5admin/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $FreeBSD$
-
-PROG= kadmin
-SRCS= kadmin.c dump.c load.c ank.c del.c del_enctype.c init.c cpw.c \
- get.c ext.c random_password.c mod.c rename.c util.c \
- kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h \
- krb5_err.h heim_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}/kadmin \
- -I${ASN1OBJDIR} \
- -I${HDBOBJDIR} \
- -I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
-LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
- -L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
- -L${HDBOBJDIR} -lhdb -L${SLOBJDIR} -lsl \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err -lreadline
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \
- ${LIBREADLINE}
-NOMAN= yes
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kadmin
-
-kadm5/private.h: kadm5
- cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
-
-kadm5/admin.h: kadm5
- cp ${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/usr.sbin/k5stash/Makefile b/kerberos5/usr.sbin/k5stash/Makefile
index 6b690d1..1e65bbb 100644
--- a/kerberos5/usr.sbin/k5stash/Makefile
+++ b/kerberos5/usr.sbin/k5stash/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kstash
+PROG= k5stash
SRCS= kstash.c hdb_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
diff --git a/kerberos5/usr.sbin/kadmin/Makefile b/kerberos5/usr.sbin/kadmin/Makefile
deleted file mode 100644
index efb6211..0000000
--- a/kerberos5/usr.sbin/kadmin/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $FreeBSD$
-
-PROG= kadmin
-SRCS= kadmin.c dump.c load.c ank.c del.c del_enctype.c init.c cpw.c \
- get.c ext.c random_password.c mod.c rename.c util.c \
- kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h \
- krb5_err.h heim_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}/kadmin \
- -I${ASN1OBJDIR} \
- -I${HDBOBJDIR} \
- -I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
-_krb4libs= -lkrb -lkafs
-_krb4deps= ${LIBKRB} ${LIBKAFS}
-.endif
-LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
- -L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
- -L${HDBOBJDIR} -lhdb -L${SLOBJDIR} -lsl \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err -lreadline
-DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \
- ${LIBREADLINE}
-NOMAN= yes
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kadmin
-
-kadm5/private.h: kadm5
- cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
-
-kadm5/admin.h: kadm5
- cp ${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/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile
index 6b690d1..1e65bbb 100644
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PROG= kstash
+PROG= k5stash
SRCS= kstash.c hdb_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
OpenPOWER on IntegriCloud