14 files changed, 519 insertions, 0 deletions
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
new file mode 100644
index 00000000000..663c31eac2f
--- /dev/null
+++ b/security/kth-krb4/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1.1.1 2000/05/25 17:57:27 wennmach Exp $
+#
+
+DISTNAME=		krb4-1.0.1
+PKGNAME=		kth-krb4-1.0.1
+CATEGORIES=		security net
+MASTER_SITES=		ftp://ftp.pdc.kth.se/pub/krb/src/
+
+MAINTAINER=		wennmach@netbsd.org
+HOMEPAGE=		http://www.pdc.kth.se/kth-krb/
+
+RESTRICTED=		"Crypto; export-controlled"
+MIRROR_DISTFILE=	no
+
+GNU_CONFIGURE=		yes
+
+post-install:
+	@${MKDIR} ${PREFIX}/share/examples/kth-krb4
+	${INSTALL_DATA} ${WRKSRC}/etc/krb.conf ${PREFIX}/share/examples/kth-krb4
+	${INSTALL_DATA} ${WRKSRC}/etc/krb.realms ${PREFIX}/share/examples/kth-krb4
+	${INSTALL_DATA} ${WRKSRC}/etc/inetd.conf.changes ${PREFIX}/share/examples/kth-krb4
+	${INSTALL_DATA} ${PKGDIR}/services.diff ${PREFIX}/share/examples/kth-krb4
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/kth-krb4/files/md5 b/security/kth-krb4/files/md5
new file mode 100644
index 00000000000..a9b494faf6c
--- /dev/null
+++ b/security/kth-krb4/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+
+MD5 (krb4-1.0.1.tar.gz) = 004d758878bc82ae86ff8690054cd1d1
diff --git a/security/kth-krb4/files/patch-sum b/security/kth-krb4/files/patch-sum
new file mode 100644
index 00000000000..481b7bf75b2
--- /dev/null
+++ b/security/kth-krb4/files/patch-sum
@@ -0,0 +1,8 @@
+$NetBSD: patch-sum,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+
+MD5 (patch-aa) = 313156e9a3f2cfd21a4853bd9e19470c
+MD5 (patch-ab) = 145e9aeacfefaca1006b0fe0edd14059
+MD5 (patch-ac) = 82c853e679cf90c13633753288cc0a5f
+MD5 (patch-ad) = 1ed13671af32c0bd7950edddab302177
+MD5 (patch-ae) = 3a0d3f6bd91f18c37152dc3c4f9e8187
+MD5 (patch-af) = 09ddef69f63038c12a53ad51b09e51b8
diff --git a/security/kth-krb4/patches/patch-aa b/security/kth-krb4/patches/patch-aa
new file mode 100644
index 00000000000..8641f3d2b60
--- /dev/null
+++ b/security/kth-krb4/patches/patch-aa
@@ -0,0 +1,57 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+
+--- lib/roken/Makefile.in.orig	Tue Nov 30 20:22:59 1999
++++ lib/roken/Makefile.in	Thu May 25 16:25:38 2000
+@@ -3,6 +3,7 @@
+ #
+ 
+ SHELL = /bin/sh
++CP = /bin/cp
+ 
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+@@ -24,6 +25,13 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ libdir = @libdir@
++
++includedir = @includedir@
++
++incdir = $(includedir)
++inc_DATA = roken.h roken-common.h
++idir = $(top_builddir)/include 
++
+ EXECSUFFIX = @EXECSUFFIX@
+ PICFLAGS = # @PICFLAGS@
+  
+@@ -162,8 +170,19 @@
+ 	$(CC) -c $(DEFS) -I. -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
+ 
+ install: all
++	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) -m 0555 $(LIB) $(DESTDIR)$(libdir)/$(LIB)
++	@install_symlink_command@
++	$(MKINSTALLDIRS) $(DESTDIR)$(includedir)
++	@for i in $(inc_DATA); do \
++	echo "  $(INSTALL_DATA) $$i $(DESTDIR)$(incdir)/$$i";\
++	$(INSTALL_DATA) $$i $(DESTDIR)$(incdir)/$$i; done
+ 
+ uninstall:
++	rm -f $(DESTDIR)$(libdir)/$(LIB)
++	@for i in $(inc_DATA); do \
++	echo "  rm -f $(DESTDIR)$(incdir)/$$i";\
++	rm -f $(DESTDIR)$(incdir)/$$i; done
+ 
+ TAGS: $(SOURCES) $(EXTRA_SOURCES)
+ 	etags $(SOURCES) $(EXTRA_SOURCES)
+@@ -213,8 +232,8 @@
+ install-roken-h: roken.h
+ 	@if [ -f ../../include/roken.h ] && cmp -s ../../include/roken.h roken.h ; \
+ 	then :; else \
+-	echo "  $(INSTALL) roken.h ../../include/roken.h"; \
+-	$(INSTALL) roken.h ../../include/roken.h; fi
++	echo "  $(CP) roken.h ../../include/roken.h"; \
++	$(CP) roken.h ../../include/roken.h; fi
+ 
+ $(OBJECTS): ../../include/config.h roken.h
+ 
diff --git a/security/kth-krb4/patches/patch-ab b/security/kth-krb4/patches/patch-ab
new file mode 100644
index 00000000000..e456575fded
--- /dev/null
+++ b/security/kth-krb4/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+
+--- lib/krb/Makefile.in.orig	Thu Nov 25 06:26:26 1999
++++ lib/krb/Makefile.in	Thu May 25 18:32:21 2000
+@@ -7,6 +7,7 @@
+ VPATH = @srcdir@
+ 
+ CC = @CC@
++CP = /bin/cp
+ LINK = @LINK@
+ AR = ar
+ RANLIB = @RANLIB@
+@@ -359,8 +360,8 @@
+ all-local: $(inc_DATA)
+ 	@for i in $(inc_DATA); do \
+ 		if cmp -s  $$i $(idir)/$$i 2> /dev/null ; then :; else\
+-			echo " $(INSTALL_DATA) $$i $(idir)/$$i"; \
+-			$(INSTALL_DATA) $$i $(idir)/$$i; \
++			echo " $(CP) $$i $(idir)/$$i"; \
++			$(CP) $$i $(idir)/$$i; \
+ 		fi ; \
+ 	done
+ 
diff --git a/security/kth-krb4/patches/patch-ac b/security/kth-krb4/patches/patch-ac
new file mode 100644
index 00000000000..71f25f7987e
--- /dev/null
+++ b/security/kth-krb4/patches/patch-ac
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+
+--- lib/kadm/Makefile.in.orig	Thu May 25 13:31:47 2000
++++ lib/kadm/Makefile.in	Thu May 25 13:32:23 2000
+@@ -3,6 +3,7 @@
+ #
+ 
+ SHELL = /bin/sh
++CP = /bin/cp
+ 
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+@@ -117,8 +118,8 @@
+ all-local: $(inc_DATA)
+ 	@for i in $(inc_DATA); do \
+ 		if cmp -s  $$i $(idir)/$$i 2> /dev/null ; then :; else\
+-			echo " $(INSTALL_DATA) $$i $(idir)/$$i"; \
+-			$(INSTALL_DATA) $$i $(idir)/$$i; \
++			echo " $(CP) $$i $(idir)/$$i"; \
++			$(CP) $$i $(idir)/$$i; \
+ 		fi ; \
+ 	done
+ 
diff --git a/security/kth-krb4/patches/patch-ad b/security/kth-krb4/patches/patch-ad
new file mode 100644
index 00000000000..979c8cbdc9b
--- /dev/null
+++ b/security/kth-krb4/patches/patch-ad
@@ -0,0 +1,40 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+
+--- appl/kauth/Makefile.in.orig	Thu May 25 13:53:23 2000
++++ appl/kauth/Makefile.in	Thu May 25 14:17:49 2000
+@@ -17,6 +17,7 @@
+ LD_FLAGS = @LD_FLAGS@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = ${INSTALL_PROGRAM:C/-s//}
+ LIBS = @LIBS@
+ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
+ 
+@@ -28,9 +29,10 @@
+ transform=@program_transform_name@
+ EXECSUFFIX=@EXECSUFFIX@
+ 
+-PROG_BIN	= kauth$(EXECSUFFIX) ksrvtgt
++PROG_BIN	= kauth$(EXECSUFFIX)
+ PROG_LIBEXEC	= kauthd$(EXECSUFFIX)
+-PROGS = $(PROG_BIN) $(PROG_LIBEXEC)
++PROG_SCRIPT	= ksrvtgt
++PROGS = $(PROG_BIN) $(PROG_LIBEXEC) $(PROG_SCRIPT)
+ 
+ SOURCES_KAUTH  = kauth.c rkinit.c
+ SOURCES_KAUTHD = kauthd.c
+@@ -58,10 +60,13 @@
+ 	for x in $(PROG_BIN); do \
+ 	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/`echo $$x| sed '$(transform)'`; \
+ 	done
++	for x in $(PROG_SCRIPT); do \
++	  $(INSTALL_SCRIPT) $$x $(DESTDIR)$(bindir)/`echo $$x| sed '$(transform)'`; \
++	done
+ 	if test -f $(DESTDIR)$(bindir)/zrefresh -o -r  $(DESTDIR)$(bindir)/zrefresh; then \
+ 	  true; \
+ 	else \
+-	  $(INSTALL_PROGRAM) $(srcdir)/zrefresh $(DESTDIR)$(bindir)/`echo zrefresh | sed '$(transform)'`; \
++	  $(INSTALL_SCRIPT) $(srcdir)/zrefresh $(DESTDIR)$(bindir)/`echo zrefresh | sed '$(transform)'`; \
+ 	fi
+ 	for x in $(PROG_LIBEXEC); do \
+ 	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(libexecdir)/`echo $$x| sed '$(transform)'`; \
diff --git a/security/kth-krb4/patches/patch-ae b/security/kth-krb4/patches/patch-ae
new file mode 100644
index 00000000000..8d137620675
--- /dev/null
+++ b/security/kth-krb4/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+
+--- appl/push/Makefile.in.orig	Thu May 25 14:36:00 2000
++++ appl/push/Makefile.in	Thu May 25 14:37:58 2000
+@@ -15,6 +15,7 @@
+ LD_FLAGS = @LD_FLAGS@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = ${INSTALL_PROGRAM:C/-s//}
+ LIBS = @LIB_hesiod@ @LIBS@
+ LIB_DBM = @LIB_DBM@
+ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
+@@ -49,7 +50,7 @@
+ install: all
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+ 	for x in $(bin_PROGRAMS); do \
+-	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
++	  $(INSTALL_SCRIPT) $$x $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
+ 	done
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
+ 	for x in $(libexec_PROGRAMS); do \
diff --git a/security/kth-krb4/patches/patch-af b/security/kth-krb4/patches/patch-af
new file mode 100644
index 00000000000..72b5252894e
--- /dev/null
+++ b/security/kth-krb4/patches/patch-af
@@ -0,0 +1,34 @@
+$NetBSD: patch-af,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+
+--- appl/kx/Makefile.in.orig	Thu May 25 14:47:35 2000
++++ appl/kx/Makefile.in	Thu May 25 14:56:51 2000
+@@ -18,6 +18,7 @@
+ LD_FLAGS = @LD_FLAGS@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = ${INSTALL_PROGRAM:C/-s//}
+ LN_S = @LN_S@
+ LIBS = $(XLIBS) @LIBS@
+ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
+@@ -37,6 +38,8 @@
+ X_PROGS_LIBEXEC = kxd$(EXECSUFFIX)
+ 
+ PROG_BIN	= @MAKE_X_PROGS_BIN@
++PROG_REALBIN	= kx$(EXECSUFFIX)
++PROG_SCRIPT	= rxterm rxtelnet tenletxr
+ PROG_LIBEXEC	= @MAKE_X_PROGS_LIBEXEC@
+ PROGS = $(PROG_BIN) $(PROG_LIBEXEC)
+ 
+@@ -62,8 +65,11 @@
+ 
+ install: all
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir)
+-	PROG_BIN='$(PROG_BIN)'; for x in $$PROG_BIN; do \
++	PROG_REALBIN='$(PROG_REALBIN)'; for x in $$PROG_REALBIN; do \
+ 	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
++	done
++	PROG_SCRIPT='$(PROG_SCRIPT)'; for x in $$PROG_SCRIPT; do \
++	  $(INSTALL_SCRIPT) $$x $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
+ 	done
+ 	PROG_LIBEXEC='$(PROG_LIBEXEC)'; for x in $$PROG_LIBEXEC; do \
+ 	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(libexecdir)/`echo $$x | sed '$(transform)'`; \
diff --git a/security/kth-krb4/pkg/COMMENT b/security/kth-krb4/pkg/COMMENT
new file mode 100644
index 00000000000..1321769e226
--- /dev/null
+++ b/security/kth-krb4/pkg/COMMENT
@@ -0,0 +1 @@
+Kerberos IV distribution from KTH
diff --git a/security/kth-krb4/pkg/DESCR b/security/kth-krb4/pkg/DESCR
new file mode 100644
index 00000000000..294db535e3b
--- /dev/null
+++ b/security/kth-krb4/pkg/DESCR
@@ -0,0 +1,6 @@
+This is a severly hacked up version of Eric Young's eBones-p9 kerberos
+version. The DES library has been updated with his 3.23 version and
+numerous patches collected over the years have been applied to both
+the kerberos and DES sources, most notably the CMU patches for extended
+lifetimes that AFS uses. There is also support for AFS built into most
+programs.  
diff --git a/security/kth-krb4/pkg/MESSAGE b/security/kth-krb4/pkg/MESSAGE
new file mode 100644
index 00000000000..6f21db56493
--- /dev/null
+++ b/security/kth-krb4/pkg/MESSAGE
@@ -0,0 +1,7 @@
+===============================================================================
+Kth-krb4 now has been installed on your system.
+
+To complete the installation you'll have to configure Kerberos.
+More information on how to configure Kerberos is available as info file.
+Sample files are installed in $prefix/share/examples/kth-krb4.
+===============================================================================
diff --git a/security/kth-krb4/pkg/PLIST b/security/kth-krb4/pkg/PLIST
new file mode 100644
index 00000000000..9cf58b65590
--- /dev/null
+++ b/security/kth-krb4/pkg/PLIST
@@ -0,0 +1,213 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2000/05/25 17:57:29 wennmach Exp $
+share/examples/kth-krb4/inetd.conf.changes
+share/examples/kth-krb4/krb.conf
+share/examples/kth-krb4/krb.realms
+share/examples/kth-krb4/services.diff
+@dirrm share/examples/kth-krb4
+include/acl.h
+include/com_err.h
+include/com_right.h
+include/des.h
+include/kadm.h
+include/kafs.h
+include/kdc.h
+include/klog.h
+include/krb.h
+include/krb-protos.h
+include/krb-archaeology.h
+include/krb_db.h
+include/ktypes.h
+include/otp.h
+include/prot.h
+include/sl.h
+include/krb_err.h
+include/kadm_err.h
+include/roken.h
+include/roken-common.h
+include/ss/ss.h
+lib/libcom_err.a
+lib/libdes.a
+lib/libkrb.a
+lib/libkdb.a
+lib/libkadm.a
+lib/libacl.a
+lib/libkafs.a
+lib/libeditline.a
+lib/libsl.a
+lib/libss.a
+lib/libotp.a
+lib/libroken.a
+bin/compile_et
+bin/des
+bin/mk_cmds
+bin/kinit
+bin/kdestroy
+bin/klist
+bin/kpasswd
+bin/kadmin
+bin/kauth
+bin/ksrvtgt
+bin/zrefresh
+bin/login
+bin/rsh
+bin/rcp
+bin/rlogin
+bin/su
+bin/pfrom
+bin/pagsh
+bin/afslog
+bin/kstring2key
+bin/xnlock
+bin/kx
+bin/rxterm
+bin/rxtelnet
+bin/tenletxr
+bin/otpprint
+bin/otp
+bin/kip
+bin/ftp
+bin/telnet
+libexec/kerberos
+libexec/kpropd
+libexec/kprop
+libexec/kadmind
+libexec/kauthd
+libexec/rshd
+libexec/rlogind
+libexec/movemail
+libexec/push
+libexec/popper
+libexec/kxd
+libexec/kipd
+libexec/ftpd
+libexec/telnetd
+sbin/ext_srvtab
+sbin/kdb_destroy
+sbin/kdb_edit
+sbin/kdb_init
+sbin/kdb_util
+sbin/kstash
+sbin/ksrvutil
+man/man1/xnlock.1
+man/man1/afslog.1
+man/man1/des.1
+man/man1/ftp.1
+man/man1/kauth.1
+man/man1/kdestroy.1
+man/man1/kerberos.1
+man/man1/kinit.1
+man/man1/klist.1
+man/man1/kpasswd.1
+man/man1/ksrvtgt.1
+man/man1/kx.1
+man/man1/login.1
+man/man1/movemail.1
+man/man1/otp.1
+man/man1/otpprint.1
+man/man1/pagsh.1
+man/man1/rcp.1
+man/man1/rlogin.1
+man/man1/rsh.1
+man/man1/rxtelnet.1
+man/man1/rxterm.1
+man/man1/su.1
+man/man1/telnet.1
+man/man1/tenletxr.1
+man/man3/acl_check.3
+man/man3/des_crypt.3
+man/man3/kafs.3
+man/man3/kerberos.3
+man/man3/krb_realmofhost.3
+man/man3/krb_sendauth.3
+man/man3/krb_set_tkt_string.3
+man/man3/kuserok.3
+man/man3/tf_util.3
+man/man3/editline.3
+man/man5/ftpusers.5
+man/man5/krb.conf.5
+man/man5/krb.equiv.5
+man/man5/krb.extra.5
+man/man5/krb.realms.5
+man/man5/login.access.5
+man/man8/ext_srvtab.8
+man/man8/ftpd.8
+man/man8/kadmin.8
+man/man8/kadmind.8
+man/man8/kauthd.8
+man/man8/kdb_destroy.8
+man/man8/kdb_edit.8
+man/man8/kdb_init.8
+man/man8/kdb_util.8
+man/man8/kerberos.8
+man/man8/kprop.8
+man/man8/kpropd.8
+man/man8/ksrvutil.8
+man/man8/kstash.8
+man/man8/kxd.8
+man/man8/popper.8
+man/man8/rlogind.8
+man/man8/rshd.8
+man/man8/telnetd.8
+man/man8/push.8
+man/cat1/afslog.0
+man/cat1/des.0
+man/cat1/ftp.0
+man/cat1/kauth.0
+man/cat1/kdestroy.0
+man/cat1/kerberos.0
+man/cat1/kinit.0
+man/cat1/klist.0
+man/cat1/kpasswd.0
+man/cat1/ksrvtgt.0
+man/cat1/kx.0
+man/cat1/login.0
+man/cat1/movemail.0
+man/cat1/otp.0
+man/cat1/otpprint.0
+man/cat1/pagsh.0
+man/cat1/rcp.0
+man/cat1/rlogin.0
+man/cat1/rsh.0
+man/cat1/rxtelnet.0
+man/cat1/rxterm.0
+man/cat1/su.0
+man/cat1/telnet.0
+man/cat1/tenletxr.0
+man/cat3/acl_check.0
+man/cat3/des_crypt.0
+man/cat3/kafs.0
+man/cat3/kerberos.0
+man/cat3/krb_realmofhost.0
+man/cat3/krb_sendauth.0
+man/cat3/krb_set_tkt_string.0
+man/cat3/kuserok.0
+man/cat3/tf_util.0
+man/cat3/editline.0
+man/cat5/ftpusers.0
+man/cat5/krb.conf.0
+man/cat5/krb.equiv.0
+man/cat5/krb.realms.0
+man/cat5/login.access.0
+man/cat8/ext_srvtab.0
+man/cat8/ftpd.0
+man/cat8/kadmin.0
+man/cat8/kadmind.0
+man/cat8/kauthd.0
+man/cat8/kdb_destroy.0
+man/cat8/kdb_edit.0
+man/cat8/kdb_init.0
+man/cat8/kdb_util.0
+man/cat8/kerberos.0
+man/cat8/kprop.0
+man/cat8/kpropd.0
+man/cat8/ksrvutil.0
+man/cat8/kstash.0
+man/cat8/kxd.0
+man/cat8/popper.0
+man/cat8/rlogind.0
+man/cat8/rshd.0
+man/cat8/telnetd.0
+man/cat8/push.0
+@unexec install-info --delete %D/info/kth-krb.info %D/info/dir
+info/kth-krb.info
+@exec install-info %D/info/kth-krb.info %D/info/dir
diff --git a/security/kth-krb4/pkg/services.diff b/security/kth-krb4/pkg/services.diff
new file mode 100644
index 00000000000..797ad23af7f
--- /dev/null
+++ b/security/kth-krb4/pkg/services.diff
@@ -0,0 +1,59 @@
+$NetBSD: services.diff,v 1.1.1.1 2000/05/25 17:57:29 wennmach Exp $
+This patch is relative to NetBSD-1.4.2.
+
+--- /etc/services.orig	Thu Apr 20 10:29:34 2000
++++ /etc/services	Thu May  4 10:38:16 2000
+@@ -52,8 +52,8 @@
+ www		80/tcp		http	# WorldWideWeb HTTP
+ www		80/udp			# HyperText Transfer Protocol
+ link		87/tcp		ttylink
+-kerberos	88/tcp		krb5	# Kerberos v5
+-kerberos	88/udp
++#kerberos	88/tcp		krb5	# Kerberos v5
++#kerberos	88/udp
+ supdup		95/tcp
+ # 100 - reserved
+ hostnames	101/tcp		hostname	# usually from sri-nic
+@@ -122,6 +122,8 @@
+ ldap	389/tcp				# Lightweight Directory Access Protocol
+ ldap	389/udp				# Lightweight Directory Access Protocol
+ 
++kpasswd		464/udp				# password changing
++kpasswd		464/tdp				# password changing
+ #
+ # UNIX specific services
+ #
+@@ -181,16 +183,29 @@
+ # Kerberos (Project Athena/MIT) services
+ # Note that these are for Kerberos v4, and are unofficial.
+ #
++#kerberos	88/tcp		krb5	# Kerberos v5
++#kerberos	88/udp
++kerberos-sec	88/tcp		krb5		# Kerberos secondary port TCP
++kerberos-sec	88/udp				# Kerberos secondary port UDP
+ klogin		543/tcp			# Kerberos `rlogin'
+ kshell		544/tcp		krcmd	# Kerberos `rsh'
++ekshell		545/tcp			# Kerberos encrypted remote shell -kfall
++kerberos-adm	749/udp			# v5 kadmin
+ kerberos-adm	749/tcp			# Kerberos `kadmin' (v5)
+-kerberos4	750/udp		kdc	# Kerberos (server) udp
+-kerberos4	750/tcp		kdc	# Kerberos (server) tcp
+-kerberos-master	751/udp			# Kerberos admin server udp
+-kerberos-master	751/tcp			# Kerberos admin server tcp
++kerberos4	750/udp		kdc kerberos kerberos-iv # Kerberos (server) udp
++kerberos4	750/tcp		kdc kerberos kerberos-iv # Kerberos (server) tcp
++kerberos-master	751/udp		kerberos_master	# Kerberos admin server udp
++kerberos-master	751/tcp		kerberos_master	# Kerberos admin server tcp
++krb_prop	754/tcp		hprop		# Kerberos slave propagation
+ krbupdate	760/tcp		kreg	# BSD Kerberos registration
+ kpasswd		761/tcp		kpwd	# BSD Kerberos `passwd'
++kpop		1109/tcp			# Pop with Kerberos
+ eklogin		2105/tcp		# Kerberos encrypted `rlogin'
++ekshell2	2106/tcp	      # What U of Colorado @ Boulder uses?
++rkinit		2108/tcp			# Kerberos remote kinit
++kx		2111/tcp			# X over kerberos
++kip		2112/tcp			# IP over kerberos
++kauth		2120/tcp			# Remote kauth
+ 
+ #
+ # Unofficial but necessary (for NetBSD) services