From 42b977a4ba90a4a1a3e6d1c4b42bff99e9b7ff45 Mon Sep 17 00:00:00 2001
From: millert <>
Date: Fri, 24 Jan 2003 06:43:29 +0000
Subject: [PATCH] Remove duplicate kerberos entries; ekshell2 should probably
 just be removed

---
 src/etc/services | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/etc/services b/src/etc/services
index 84c94473..05f485ab 100644
--- a/src/etc/services
+++ b/src/etc/services
@@ -1,4 +1,4 @@
-#	$OpenBSD: services,v 1.48 2002/12/15 21:25:49 jakob Exp $
+#	$OpenBSD: services,v 1.49 2003/01/24 06:43:29 millert Exp $
 #
 # Network services, Internet style
 #
@@ -135,6 +135,7 @@ kpasswd		464/udp				# Kerberos 5 password changing
 photuris	468/tcp				# Photuris Key Management
 photuris	468/udp
 isakmp		500/udp				# ISAKMP key management
+klogin		543/tcp				# Kerberos authenticated rlogin
 kshell		544/tcp		krcmd		# Kerberos remote shell
 ekshell		545/tcp				# Kerberos encrypted shell
 submission	587/tcp		msa		# mail message submission
@@ -176,6 +177,7 @@ kerberos-iv	750/tcp		kdc		# Kerberos authentication--tcp
 kerberos_master 751/udp				# Kerberos 4 kadmin
 kerberos_master 751/tcp				# Kerberos 4 kadmin
 krb_prop	754/tcp		hprop		# Kerberos slave propagation
+krbupdate	760/tcp		kreg		# BSD Kerberos registration
 #
 # From ``Assigned Numbers'':
 #
@@ -192,7 +194,7 @@ krb_prop	754/tcp		hprop		# Kerberos slave propagation
 #> community.
 #
 socks		1080/tcp		# Socks
-kpop		1109/tcp			# Pop with Kerberos
+kpop		1109/tcp		# Pop with Kerberos
 ingreslock	1524/tcp
 ingreslock	1524/udp
 prospero-np	1525/tcp		# Prospero non-privileged
@@ -217,29 +219,6 @@ rfe		5002/udp		# Actually uses UDP only
 sip		5060/tcp		# SIP
 sip		5060/udp		# SIP
 #
-# Kerberos (Project Athena/MIT) services
-# Note that these are for Kerberos v4, and are unofficial.
-#
-kerberos-sec	88/udp				# Kerberos secondary port UDP
-kerberos-sec	88/tcp				# Kerberos secondary port TCP
-klogin		543/tcp				# Kerberos authenticated rlogin
-kshell		544/tcp		krcmd		# and remote shell
-ekshell		545/tcp		     # Kerberos encrypted remote shell -kfall
-ekshell2	2106/tcp	     # What U of Colorado @ Boulder uses?
-kerberos-adm	749/tcp				# Kerberos `kadmin' (v5)
-kerberos-iv	750/udp		kdc kerberos	# Kerberos authentication--udp
-kerberos-iv	750/tcp		kdc kerberos	# Kerberos authentication--tcp
-kerberos_master	751/udp		kerberos-master	# Kerberos authentication
-kerberos_master	751/tcp		kerberos-master # Kerberos authentication
-krb_prop	754/tcp				# Kerberos slave propagation
-krbupdate	760/tcp		kreg		# BSD Kerberos registration
-kpop		1109/tcp			# Pop with Kerberos
-eklogin		2105/tcp			# Kerberos encrypted rlogin
-rkinit		2108/tcp			# Kerberos remote kinit
-kx		2111/tcp			# X over kerberos
-kip		2112/tcp			# IP over kerberos
-kauth		2120/tcp			# Remote kauth
-#
 # AFS Services
 #
 afs3-fileserver		7000/udp	# AFS fileserver
@@ -263,6 +242,7 @@ datametrics	1645/udp
 sa-msg-port	1646/udp
 radius		1812/udp		# radius authentication
 radacct		1813/udp		# radius accounting
+ekshell2	2106/tcp		# Encrypted kshell - UColorado, Boulder
 cvspserver	2401/tcp		# cvs pserver
 webster		2627/tcp		# Network dictionary
 webster		2627/udp