From b2e9880db07ae264a379ee030e0245b598226548 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 30 Mar 2001 10:25:40 +0000
Subject: [PATCH] Integrate the IPv6 entries with the rest of them to avoid
 things getting out of sync.  A similar change was made by itojun on the
 OpenBSD tree a few weeks ago.  This should stop people disabling one server
 and forgetting the other one (eg: ftp and/or telnet)

---
 etc/inetd.conf | 50 ++++++++++++++++++--------------------------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/etc/inetd.conf b/etc/inetd.conf
index b5e4d1623813..a4d3953d7276 100644
--- a/etc/inetd.conf
+++ b/etc/inetd.conf
@@ -2,13 +2,18 @@
 #
 # Internet server configuration database
 #
-#	@(#)inetd.conf	5.4 (Berkeley) 6/30/90
+# define *both* IPv4 and IPv6 entries for dual-stack support.
 #
 ftp	stream	tcp	nowait	root	/usr/libexec/ftpd	ftpd -l
+ftp	stream	tcp6	nowait	root	/usr/libexec/ftpd	ftpd -l
 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
+#shell	stream	tcp6	nowait	root	/usr/libexec/rshd	rshd
 #login	stream	tcp	nowait	root	/usr/libexec/rlogind	rlogind
+#login	stream	tcp6	nowait	root	/usr/libexec/rlogind	rlogind
 #finger	stream	tcp	nowait/3/10 nobody /usr/libexec/fingerd	fingerd -s
+#finger	stream	tcp6	nowait/3/10 nobody /usr/libexec/fingerd	fingerd -s
 #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
@@ -24,15 +29,25 @@ ntalk	dgram	udp	wait	tty:tty	/usr/libexec/ntalkd	ntalkd
 # need.
 #
 #daytime stream	tcp	nowait	root	internal
+#daytime stream	tcp6	nowait	root	internal
 #daytime dgram	udp	wait	root	internal
+#daytime dgram	udp6	wait	root	internal
 #time	stream	tcp	nowait	root	internal
+#time	stream	tcp6	nowait	root	internal
 #time	 dgram	udp	wait	root	internal
+#time	 dgram	udp6	wait	root	internal
 #echo	stream	tcp	nowait	root	internal
+#echo	dgram	udp6	wait	root	internal
 #echo	dgram	udp	wait	root	internal
+#echo	stream	tcp6	nowait	root	internal
 #discard stream	tcp	nowait	root	internal
+#discard stream	tcp6	nowait	root	internal
 #discard dgram	udp	wait	root	internal
+#discard dgram	udp6	wait	root	internal
 #chargen stream	tcp	nowait	root	internal
+#chargen stream	tcp6	nowait	root	internal
 #chargen dgram	udp	wait	root	internal
+#chargen dgram	udp6	wait	root	internal
 #
 # Kerberos authenticated services
 #
@@ -68,12 +83,14 @@ ntalk	dgram	udp	wait	tty:tty	/usr/libexec/ntalkd	ntalkd
 # Return error for all "ident" requests
 #
 #auth	stream	tcp	nowait	root	internal
+#auth	stream	tcp6	nowait	root	internal
 #
 # Provide internally a real "ident" service which provides ~/.fakeid support,
 # provides ~/.noident support, reports UNKNOWN as the operating system type
 # and times out after 30 seconds.
 #
 #auth	stream	tcp	nowait	root	internal	auth -r -f -n -o UNKNOWN -t 30
+#auth	stream	tcp6	nowait	root	internal	auth -r -f -n -o UNKNOWN -t 30
 #
 # Example entry for an external ident server
 #
@@ -91,34 +108,3 @@ ntalk	dgram	udp	wait	tty:tty	/usr/libexec/ntalkd	ntalkd
 #
 #netbios-ssn stream tcp nowait root /usr/local/sbin/smbd smbd 
 #netbios-ns dgram udp wait root /usr/local/sbin/nmbd nmbd 
-
-
-#
-# IPv6 services
-#
-ftp	stream	tcp6	nowait	root	/usr/libexec/ftpd	ftpd -l
-telnet	stream	tcp6	nowait	root	/usr/libexec/telnetd	telnetd
-#shell	stream	tcp6	nowait	root	/usr/libexec/rshd	rshd
-#login	stream	tcp6	nowait	root	/usr/libexec/rlogind	rlogind
-#finger	stream	tcp6	nowait/3/10 nobody /usr/libexec/fingerd	fingerd -s
-#
-# IPv6 "Small servers"
-# 
-#daytime stream	tcp6	nowait	root	internal
-#daytime dgram	udp6	wait	root	internal
-#time	stream	tcp6	nowait	root	internal
-#time	 dgram	udp6	wait	root	internal
-#echo	stream	tcp6	nowait	root	internal
-#echo	dgram	udp6	wait	root	internal
-#discard stream	tcp6	nowait	root	internal
-#discard dgram	udp6	wait	root	internal
-#chargen stream	tcp6	nowait	root	internal
-#chargen dgram	udp6	wait	root	internal
-#
-# Return error for all IPv6 "ident" requests
-#
-#auth	stream	tcp6	nowait	root	internal
-#
-# Example entry for a real IPv6 ident service similar to the one above for IPv4.
-#
-#auth	stream	tcp6	nowait	root	internal	auth -r -f -n -o UNKNOWN -t 30