[src/trunk]: src/etc - fix manet alias to MANET; giving an alias with the sam...

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

details:   https://anonhg.NetBSD.org/src/rev/5f2f8f54a2cd
branches:  trunk
changeset: 781225:5f2f8f54a2cd
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Aug 28 07:53:45 2012 +0000

description:
- fix manet alias to MANET; giving an alias with the same name is a no/op
- protocol 84 is defined for as ttp and iptm, merge the two entries since
  libc getprotoent() does not read the whole file and merge in the "files"
  implementation.

diffstat:

 etc/protocols |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r d49535bc88ed -r 5f2f8f54a2cd etc/protocols
--- a/etc/protocols     Mon Aug 27 22:25:09 2012 +0000
+++ b/etc/protocols     Tue Aug 28 07:53:45 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: protocols,v 1.24 2012/08/25 11:14:34 christos Exp $
+# $NetBSD: protocols,v 1.25 2012/08/28 07:53:45 christos Exp $
 # See also: protocols(5), http://www.sethwklein.net/projects/iana-etc/
 #
 #    Last Updated
@@ -128,8 +128,8 @@
 vmtp          81 VMTP         # VMTP                                  [Dave_Cheriton]
 secure-vmtp   82 SECURE-VMTP  # SECURE-VMTP                           [Dave_Cheriton]
 vines         83 VINES        # VINES                                 [Brian Horn]
-ttp           84 TTP          # TTP                                   [Jim_Stevens]
-iptm          84 IPTM         # Protocol Internet Protocol Traffic    [Jim_Stevens]
+ttp           84 TTP iptm IPTM # TTP                                   [Jim_Stevens]
+#iptm          84 IPTM         # Protocol Internet Protocol Traffic    [Jim_Stevens]
 #                            Manager
 nsfnet-igp    85 NSFNET-IGP   # NSFNET-IGP                            [Hans_Werner_Braun]
 dgp           86 DGP          # Dissimilar Gateway Protocol           [M/A-COM Government Systems, "Dissimilar Gateway Protocol Specification, Draft
@@ -188,7 +188,7 @@
 mobility     135 Mobility     # Header                                       [RFC6275]
 udplite      136 UDPLite      # [RFC3828]
 mpls-in-ip   137 MPLS-in-IP   # [RFC4023]
-manet        138 manet        # MANET Protocols                       [RFC5498]
+manet        138 MANET        # MANET Protocols                       [RFC5498]
 hip          139 HIP          # Host Identity Protocol                [RFC5201]
 shim6        140 Shim6        # Shim6 Protocol                        [RFC5533]
 wesp         141 WESP         # Wrapped Encapsulating Security        [RFC5840]