[src/netbsd-1-5]: src Update from trunk:

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d0b7e668cc54
branches:  netbsd-1-5
changeset: 488917:d0b7e668cc54
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Aug 06 21:14:23 2000 +0000

description:
Update from trunk:
The Kerberos KDC belongs in /usr/sbin, not in /usr/libexec.

diffstat:

 libexec/Makefile      |   4 ++--
 libexec/kdc/Makefile  |  48 ------------------------------------------------
 usr.sbin/Makefile     |   4 ++--
 usr.sbin/kdc/Makefile |  48 ++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 52 deletions(-)

diffs (140 lines):

diff -r 7855b6d4c199 -r d0b7e668cc54 libexec/Makefile
--- a/libexec/Makefile  Sun Aug 06 21:11:05 2000 +0000
+++ b/libexec/Makefile  Sun Aug 06 21:14:23 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.37.2.2 2000/06/24 06:59:34 thorpej Exp $
+#      $NetBSD: Makefile,v 1.37.2.3 2000/08/06 21:14:23 thorpej Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/4/93
 
 .include <bsd.own.mk>
@@ -10,7 +10,7 @@
 
 .if (${MKCRYPTO} != "no")
 # Heimdal/KTH Kerberos
-SUBDIR+= hprop hpropd kadmind kdc kfd kpasswdd
+SUBDIR+= hprop hpropd kadmind kfd kpasswdd
 .endif
 
 .include <bsd.subdir.mk>
diff -r 7855b6d4c199 -r d0b7e668cc54 libexec/kdc/Makefile
--- a/libexec/kdc/Makefile      Sun Aug 06 21:11:05 2000 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.2.2.1 2000/08/06 21:11:05 thorpej Exp $
-DIST=          ${.CURDIR}/../../crypto/dist
-.PATH: ${DIST}/heimdal/kdc
-
-WARNS?=  1
-MKLINT= no
-
-PROG= kdc
-
-SRCS=  524.c           \
-       config.c        \
-       connect.c       \
-       kaserver.c      \
-       kdc_locl.h      \
-       kerberos4.c     \
-       kerberos4.h     \
-       kerberos5.c     \
-       log.c           \
-       main.c          \
-       misc.c          \
-
-CPPFLAGS+= -I.                                 \
-       -I${DIST}/heimdal/kdc                   \
-       -I${.CURDIR}/../../include/heimdal      \
-       -I${DIST}/heimdal/lib/asn1              \
-       -I${DIST}/heimdal/lib/krb5              \
-       -I${DESTDIR}/usr/include/kerberosIV     \
-       -I${DESTDIR}/usr/include/krb5           \
-       -I${DIST}/openssl/crypto/md4            \
-       -I${DIST}/openssl/crypto/md5            \
-       -I${DIST}/openssl/crypto/sha            \
-       -I${DIST}/openssl/crypto/rc4            \
-       -I${DIST}/openssl/crypto/des            \
-       -DHAVE_CONFIG_H
-
-LDADD= -lhdb                                   \
-       -lkrb5                                  \
-       -lkrb                                   \
-       -lcrypto                                \
-       -lasn1                                  \
-       -lcom_err                               \
-       -lroken                                 \
-       -lcrypt                                 \
-       -lutil
-
-MAN=   kdc.8
-
-.include <bsd.prog.mk>
diff -r 7855b6d4c199 -r d0b7e668cc54 usr.sbin/Makefile
--- a/usr.sbin/Makefile Sun Aug 06 21:11:05 2000 +0000
+++ b/usr.sbin/Makefile Sun Aug 06 21:14:23 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.144.2.3 2000/06/30 18:15:39 thorpej Exp $
+#      $NetBSD: Makefile,v 1.144.2.4 2000/08/06 21:14:24 thorpej Exp $
 #      from: @(#)Makefile      5.20 (Berkeley) 6/12/93
 
 .include <bsd.own.mk>
@@ -28,7 +28,7 @@
 SUBDIR+=pvcsif pvctxctl
 
 .if (${MKCRYPTO} != "no")
-SUBDIR+= kadmin kstash ktutil
+SUBDIR+= kadmin kdc kstash ktutil
 .endif
 
 .include <bsd.subdir.mk>
diff -r 7855b6d4c199 -r d0b7e668cc54 usr.sbin/kdc/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.sbin/kdc/Makefile     Sun Aug 06 21:14:23 2000 +0000
@@ -0,0 +1,48 @@
+# $NetBSD: Makefile,v 1.1.2.2 2000/08/06 21:14:24 thorpej Exp $
+DIST=          ${.CURDIR}/../../crypto/dist
+.PATH: ${DIST}/heimdal/kdc
+
+WARNS?=  1
+MKLINT= no
+
+PROG= kdc
+
+SRCS=  524.c           \
+       config.c        \
+       connect.c       \
+       kaserver.c      \
+       kdc_locl.h      \
+       kerberos4.c     \
+       kerberos4.h     \
+       kerberos5.c     \
+       log.c           \
+       main.c          \
+       misc.c          \
+
+CPPFLAGS+= -I.                                 \
+       -I${DIST}/heimdal/kdc                   \
+       -I${.CURDIR}/../../include/heimdal      \
+       -I${DIST}/heimdal/lib/asn1              \
+       -I${DIST}/heimdal/lib/krb5              \
+       -I${DESTDIR}/usr/include/kerberosIV     \
+       -I${DESTDIR}/usr/include/krb5           \
+       -I${DIST}/openssl/crypto/md4            \
+       -I${DIST}/openssl/crypto/md5            \
+       -I${DIST}/openssl/crypto/sha            \
+       -I${DIST}/openssl/crypto/rc4            \
+       -I${DIST}/openssl/crypto/des            \
+       -DHAVE_CONFIG_H
+
+LDADD= -lhdb                                   \
+       -lkrb5                                  \
+       -lkrb                                   \
+       -lcrypto                                \
+       -lasn1                                  \
+       -lcom_err                               \
+       -lroken                                 \
+       -lcrypt                                 \
+       -lutil
+
+MAN=   kdc.8
+
+.include <bsd.prog.mk>