MFC 1.69-74, which includes an update to IANA's URL, updated

comments, entries for several commonly used tools from
ports, and x11.

1 files changed, 32 insertions, 11 deletions

diff --git a/etc/services b/etc/services
index 2f686f482b8d..8345d1f27506 100644
--- a/etc/services
+++ b/etc/services
@@ -4,11 +4,11 @@
 # Note that it is presently the policy of IANA to assign a single well-known
 # port number for both TCP and UDP; hence, most entries here have two entries
 # even if the protocol doesn't support UDP operations.
-# Updated from RFC 1700, ``Assigned Numbers'' (October 1994).  All ports
-# are included.
 #
 # The latest IANA port assignments can be gotten from
-#	http://www.isi.edu/in-notes/iana/assignments/port-numbers 
+#
+#	http://www.iana.org/assignments/port-numbers
+#
 # The Well Known Ports are those from 0 through 1023.
 # The Registered Ports are those from 1024 through 49151
 # The Dynamic and/or Private Ports are those from 49152 through 65535
@@ -196,8 +196,8 @@ dixie		 96/tcp	   #DIXIE Protocol Specification
 dixie		 96/udp	   #DIXIE Protocol Specification
 swift-rvf	 97/tcp	   #Swift Remote Virtural File Protocol
 swift-rvf	 97/udp	   #Swift Remote Virtural File Protocol
-tacnews		 98/tcp	   #TAC News
-tacnews		 98/udp	   #TAC News
+tacnews		 98/tcp	   #TAC News, Unofficial: Red Hat linuxconf
+tacnews		 98/udp	   #TAC News, Unofficial: Red Hat linuxconf
 metagram	 99/tcp	   #Metagram Relay
 metagram	 99/udp	   #Metagram Relay
 newacct		100/tcp	   #[unauthorized use]
@@ -1089,8 +1089,12 @@ npmp-local	610/tcp
 npmp-local	610/udp
 npmp-gui	611/tcp
 npmp-gui	611/udp
+sshell		614/tcp	   #SSLshell
+sshell		614/udp
 ginad		634/tcp
 ginad		634/udp
+ldaps		636/tcp    sldap #ldap protocol over TLS/SSL
+ldaps		636/udp    sldap
 mdqs		666/tcp 
 mdqs		666/udp 
 #PROBLEMS!===============================================
@@ -1191,13 +1195,22 @@ mdbs_daemon	800/udp
 device		801/tcp
 device		801/udp
 supfilesrv	871/tcp			# for SUP
+rsync		873/tcp
+rsync		873/udp
 accessbuilder	888/tcp
 accessbuilder	888/udp
-telnets		992/tcp
-imaps		993/tcp
+ftps-data	989/tcp			# ftp protocol, data, over TLS/SSL
+ftps-data	989/udp
+ftps		990/tcp			# ftp protocol, control, over TLS/SSL
+ftps		990/udp
+telnets		992/tcp			# telnet protocol over TLS/SSL
+telnets		992/udp
+imaps		993/tcp			# imap4 protocol over TLS/SSL
+imaps		993/udp
 ircs		994/tcp			# irc protocol over TLS/SSL
-ircs		994/udp			# irc protocol over TLS/SSL
-pop3s		995/tcp
+ircs		994/udp
+pop3s		995/tcp	spop3		# pop3 protocol over TLS/SSL
+pop3s		995/udp	spop3
 vsinet		996/tcp
 vsinet		996/udp
 maitrd		997/tcp
@@ -1235,6 +1248,8 @@ ansoft-lm-1	1083/tcp   #Anasoft License Manager
 ansoft-lm-1	1083/udp   #Anasoft License Manager
 ansoft-lm-2	1084/tcp   #Anasoft License Manager
 ansoft-lm-2	1084/udp   #Anasoft License Manager
+kpop		1109/tcp   #Unofficial
+kpop		1109/udp   #Unofficial
 nfsd-status	1110/tcp   #Cluster status info
 nfsd-keepalive	1110/udp   #Client status info
 supfiledbg	1127/tcp		# for SUP
@@ -1989,8 +2004,10 @@ prosharerequest 5716/udp   #proshare conf request
 prosharenotify	5717/tcp   #proshare conf notify 
 prosharenotify	5717/udp   #proshare conf notify 
 cvsup		5999/tcp   #CVSup file transfer/John Polstra/FreeBSD
-#x11		6000-6063/tcp	X Window System
-#x11		6000-6063/udp	X Window System
+x11		6000/tcp   #6000-6063 are assigned to X Window System
+x11		6000/udp
+x11-ssh		6010/tcp   #Unofficial name, for convenience
+x11-ssh		6010/udp
 softcm		6110/tcp   #HP SoftBench CM
 softcm		6110/udp   #HP SoftBench CM
 spc		6111/tcp   #HP SoftBench Sub-Process Control
@@ -2035,6 +2052,10 @@ afs3-update	7008/tcp   #server-to-server updater
 afs3-update	7008/udp   #server-to-server updater
 afs3-rmtsys	7009/tcp   #remote cache manager service
 afs3-rmtsys	7009/udp   #remote cache manager service
+afs3-resserver	7010/tcp   #MR-AFS residence server
+afs3-resserver	7010/udp   #MR-AFS residence server
+afs3-remio	7011/tcp   #MR-AFS remote IO server
+afs3-remio	7011/udp   #MR-AFS remote IO server
 ups-onlinet	7010/tcp   #onlinet uninterruptable power supplies
 ups-onlinet	7010/udp   #onlinet uninterruptable power supplies
 font-service	7100/tcp   #X Font Service