MFC.

Added:
 ipp         631    #IPP (Internet Printing Protocol)
 webobjects  1085   #Web Objects
 l2tp        1701   #Layer 2 Tunnelling Protocol
 eppc        3031   #Remote AppleEvents/PPC Toolbox

Plus some imap[34] related corrections.

1 files changed, 16 insertions, 10 deletions

diff --git a/etc/services b/etc/services
index 15023a763586..47b0b8b0dfcb 100644
--- a/etc/services
+++ b/etc/services
@@ -447,8 +447,9 @@ mpp		218/tcp	   #Netix Message Posting Protocol
 mpp		218/udp	   #Netix Message Posting Protocol
 uarps		219/tcp	   #Unisys ARPs
 uarps		219/udp	   #Unisys ARPs
-imap3		220/tcp	   #Interactive Mail Access Protocol v3
-imap3		220/udp	   #Interactive Mail Access Protocol v3
+#imap3@220 was never used and never should have been allocated. See PR 46294.
+#imap3		220/tcp	   #Interactive Mail Access Protocol v3
+#imap3		220/udp	   #Interactive Mail Access Protocol v3
 fln-spx		221/tcp	   #Berkeley rlogind with SPX auth
 fln-spx		221/udp	   #Berkeley rlogind with SPX auth
 rsh-spx		222/tcp	   #Berkeley rshd with SPX auth
@@ -465,7 +466,6 @@ link		245/tcp
 link		245/udp
 dsp3270		246/tcp	   #Display Systems Protocol
 dsp3270		246/udp	   #Display Systems Protocol
-
 subntbcst_tftp	247/tcp	   #subntbcst_tftp
 subntbcst_tftp	247/udp	   #subntbcst_tftp
 bhfhs		248/tcp
@@ -531,8 +531,6 @@ fatserv		347/tcp	   #Fatmen Server
 fatserv		347/udp	   #Fatmen Server
 csi-sgwp	348/tcp	   #Cabletron Management Protocol
 csi-sgwp	348/udp	   #Cabletron Management Protocol
-
-
 mftp		349/tcp
 mftp		349/udp
 matip-type-a	350/tcp	   #MATIP Type A
@@ -1016,9 +1014,6 @@ meter		570/tcp	   #demon
 meter		570/udp	   #demon
 umeter		571/tcp	   #udemon
 umeter		571/udp	   #udemon
-
-
-
 sonar		572/tcp
 sonar		572/udp
 banyan-vip	573/tcp
@@ -1045,8 +1040,9 @@ philips-vc	583/tcp	   #Philips Video-Conferencing
 philips-vc	583/udp	   #Philips Video-Conferencing
 keyserver	584/tcp
 keyserver	584/udp
-imap4-ssl	585/tcp	   #IMAP4+SSL (use of 585 is not recommended,
-imap4-ssl	585/udp	   #		use 993 instead)
+#imap4-ssl@585 never should have been allocated. See PR 46294.
+#imap4-ssl	585/tcp	   #IMAP4+SSL (use of 585 is not recommended,
+#imap4-ssl	585/udp	   #		use 993 instead)
 password-chg	586/tcp
 password-chg	586/udp
 submission	587/tcp
@@ -1091,6 +1087,8 @@ npmp-gui	611/tcp
 npmp-gui	611/udp
 sshell		614/tcp	   #SSLshell
 sshell		614/udp
+ipp		631/tcp    #IPP (Internet Printing Protocol)
+ipp		631/udp    #IPP (Internet Printing Protocol)
 ginad		634/tcp
 ginad		634/udp
 ldaps		636/tcp    sldap #ldap protocol over TLS/SSL
@@ -1249,6 +1247,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
+webobjects	1085/tcp   #Web Objects
+webobjects	1085/udp   #Web Objects
 kpop		1109/tcp   #Unofficial
 kpop		1109/udp   #Unofficial
 nfsd-status	1110/tcp   #Cluster status info
@@ -1723,6 +1723,10 @@ netview-aix-11	1671/tcp
 netview-aix-11	1671/udp
 netview-aix-12	1672/tcp
 netview-aix-12	1672/udp
+l2f		1701/tcp   #l2f
+l2f		1701/udp   #l2f
+l2tp		1701/tcp   #Layer 2 Tunnelling Protocol
+l2tp		1701/udp   #Layer 2 Tunnelling Protocol
 pptp		1723/tcp   #Point-to-point tunnelling protocol
 # IMPORTANT NOTE: See comments for ports 1645/1646 when using older equipment
 radius		1812/udp   #RADIUS authentication protocol (IANA sanctioned)
@@ -1906,6 +1910,8 @@ www-dev		2784/tcp   #world wide web - development
 www-dev		2784/udp   #world wide web - development
 dict		2628/tcp   #RFC 2229
 dict		2628/udp   #RFC 2229
+eppc		3031/tcp   #Remote AppleEvents/PPC Toolbox
+eppc		3031/udp   #Remote AppleEvents/PPC Toolbox
 NSWS		3049/tcp
 NSWS		3049/udp
 sj3		3086/tcp   #SJ3 (kanji input)