[src/netbsd-1-5]: src/etc Apply patch (requested by thorpej):

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

details:   https://anonhg.NetBSD.org/src/rev/ae13d1092184
branches:  netbsd-1-5
changeset: 491214:ae13d1092184
user:      he <he%NetBSD.org@localhost>
date:      Fri Apr 06 00:40:59 2001 +0000

description:
Apply patch (requested by thorpej):
  Correct a few INET6 and Kerberos entries.
  Mostly syncs with version 1.44.

diffstat:

 etc/inetd.conf |  51 +++++++++++++++++++++++++++------------------------
 1 files changed, 27 insertions(+), 24 deletions(-)

diffs (103 lines):

diff -r 7091ff618637 -r ae13d1092184 etc/inetd.conf
--- a/etc/inetd.conf    Fri Apr 06 00:37:13 2001 +0000
+++ b/etc/inetd.conf    Fri Apr 06 00:40:59 2001 +0000
@@ -1,19 +1,25 @@
-#      $NetBSD: inetd.conf,v 1.35.2.4 2000/09/19 19:07:59 fvdl Exp $
+#      $NetBSD: inetd.conf,v 1.35.2.5 2001/04/06 00:40:59 he Exp $
 #
 # Internet server configuration database
 #
 #      @(#)inetd.conf  8.2 (Berkeley) 3/18/94
 #
 #ftp           stream  tcp     nowait  root    /usr/libexec/ftpd       ftpd -ll
+#ftp           stream  tcp6    nowait  root    /usr/libexec/ftpd       ftpd -ll
 #telnet                stream  tcp     nowait  root    /usr/libexec/telnetd    telnetd
+#telnet                stream  tcp6    nowait  root    /usr/libexec/telnetd    telnetd
 #shell         stream  tcp     nowait  root    /usr/libexec/rshd       rshd -L
+#shell         stream  tcp6    nowait  root    /usr/libexec/rshd       rshd -L
 #login         stream  tcp     nowait  root    /usr/libexec/rlogind    rlogind -L
+#login         stream  tcp6    nowait  root    /usr/libexec/rlogind    rlogind -L
 #exec          stream  tcp     nowait  root    /usr/libexec/rexecd     rexecd
 #uucpd         stream  tcp     nowait  root    /usr/libexec/uucpd      uucpd
 #nntp          stream  tcp     nowait  usenet  /usr/libexec/nntpd      nntpd
 #finger                stream  tcp     nowait  nobody  /usr/libexec/fingerd    fingerd
+#finger                stream  tcp6    nowait  nobody  /usr/libexec/fingerd    fingerd
 #ident         stream  tcp     nowait  nobody:kmem /usr/libexec/identd identd -l -o -e -N
 #tftp          dgram   udp     wait    root    /usr/libexec/tftpd      tftpd -l -s /tftpboot
+#tftp          dgram   udp6    wait    root    /usr/libexec/tftpd      tftpd -l -s /tftpboot
 #comsat                dgram   udp     wait    root    /usr/libexec/comsat     comsat
 #ntalk         dgram   udp     wait    nobody:tty      /usr/libexec/ntalkd     ntalkd
 #bootps                dgram   udp     wait    root    /usr/sbin/bootpd        bootpd
@@ -26,16 +32,27 @@
 #
 #tcpmux                stream  tcp     nowait  root    internal
 #echo          stream  tcp     nowait  nobody  internal
+#echo          stream  tcp6    nowait  nobody  internal
 #discard       stream  tcp     nowait  nobody  internal
+#discard       stream  tcp6    nowait  nobody  internal
 #chargen       stream  tcp     nowait  nobody  internal
+#chargen       stream  tcp6    nowait  nobody  internal
 #daytime       stream  tcp     nowait  nobody  internal
+#daytime       stream  tcp6    nowait  nobody  internal
 #time          stream  tcp     nowait  nobody  internal
+#time          stream  tcp6    nowait  nobody  internal
 #echo          dgram   udp     wait    nobody  internal
+#echo          dgram   udp6    wait    nobody  internal
 #discard       dgram   udp     wait    nobody  internal
+#discard       dgram   udp6    wait    nobody  internal
 #chargen       dgram   udp     wait    nobody  internal
+#chargen       dgram   udp6    wait    nobody  internal
 #daytime       dgram   udp     wait    nobody  internal
+#daytime       dgram   udp6    wait    nobody  internal
 #time          dgram   udp     wait    nobody  internal
+#time          dgram   udp6    wait    nobody  internal
 #qotd          stream  tcp     nowait  nobody  /usr/games/fortune      fortune
+#qotd          stream  tcp6    nowait  nobody  /usr/games/fortune      fortune
 #
 #      Kerberos authenticated services
 #
@@ -46,35 +63,21 @@
 #      Services run ONLY on the Kerberos server
 #
 #kerberos-adm  stream  tcp     nowait  root    /usr/libexec/kadmind    kadmind
-#kpasswd       dgram   udp     nowait  root    /usr/libexec/kpasswdd   kpasswdd
+#kerberos-adm  stream  tcp6    nowait  root    /usr/libexec/kadmind    kadmind
+#kpasswd       dgram   udp     wait    root    /usr/libexec/kpasswdd   kpasswdd
+#kpasswd       dgram   udp6    wait    root    /usr/libexec/kpasswdd   kpasswdd
 #
 # The hprop service is run on slave KDCs to receive the database from
 # the master KDC.
 #hprop         stream  tcp     nowait  root    /usr/libexec/hpropd     hpropd
+#hprop         stream  tcp6    nowait  root    /usr/libexec/hpropd     hpropd
 #
 #      RPC based services
 #
-#rstatd/1-3    dgram   rpc/udp wait:100        nobody:kmem     /usr/libexec/rpc.rstatd rpc.rstatd
-#rusersd/2-3   dgram   rpc/udp wait:100        nobody  /usr/libexec/rpc.rusersd rpc.rusersd
-#walld/1       dgram   rpc/udp wait    nobody:tty      /usr/libexec/rpc.rwalld rpc.rwalld
+#rstatd/1-3    dgram   rpc/udp wait:100 nobody:kmem /usr/libexec/rpc.rstatd rpc.rstatd
+#rstatd/1-3    dgram   rpc/udp6 wait:100 nobody:kmem /usr/libexec/rpc.rstatd rpc.rstatd
+#rusersd/2-3   dgram   rpc/udp wait:100 nobody /usr/libexec/rpc.rusersd rpc.rusersd
+#rusersd/2-3   dgram   rpc/udp6 wait:100 nobody /usr/libexec/rpc.rusersd rpc.rusersd
+#walld/1       dgram   rpc/udp wait    nobody:tty /usr/libexec/rpc.rwalld rpc.rwalld
 #sprayd/1      dgram   rpc/udp wait    nobody  /usr/libexec/rpc.sprayd rpc.sprayd
 #rquotad/1     dgram   rpc/udp wait    root    /usr/libexec/rpc.rquotad rpc.rquotad
-#
-#      IPv6 services.
-#      The only difference with the above is "tcp6" instead of "tcp".
-#      Be sure to enable both "tcp" and "tcp6" when you need service for
-#      both IPv4/v6.  Consult inetd(8) for details.
-#
-#ftp           stream  tcp6    nowait  root    /usr/libexec/ftpd       ftpd -ll
-#telnet                stream  tcp6    nowait  root    /usr/libexec/telnetd    telnetd
-#shell         stream  tcp6    nowait  root    /usr/libexec/rshd       rshd -L
-#login         stream  tcp6    nowait  root    /usr/libexec/rlogind    rlogind -L
-#finger                stream  tcp6    nowait  nobody  /usr/libexec/fingerd    fingerd
-#tftp          dgram   udp6    wait    root    /usr/libexec/tftpd      tftpd -l -s /tftpboot
-#kpasswd       dgram   udp6    nowait  root    /usr/libexec/kpasswdd   kpasswdd
-
-#
-#      IPv6 RPC services.
-#
-#rstatd/1-3    dgram   rpc/udp6        wait:100        root    /usr/libexec/rpc.rstatd rpc.rstatd
-#rusersd/2-3   dgram   rpc/udp6        wait:100        root    /usr/libexec/rpc.rusersd rpc.rusersd