===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/Attic/inetd.conf,v
retrieving revision 1.38
retrieving revision 1.39
diff -c -r1.38 -r1.39
*** src/etc/Attic/inetd.conf	2000/12/19 23:21:39	1.38
--- src/etc/Attic/inetd.conf	2001/03/08 01:24:02	1.39
***************
*** 1,30 ****
! #	$OpenBSD: inetd.conf,v 1.38 2000/12/19 23:21:39 todd Exp $
  #
  # Internet server configuration database
  #
  #ftp		stream	tcp	nowait	root	/usr/libexec/ftpd	ftpd -US
  #telnet		stream	tcp	nowait	root	/usr/libexec/telnetd	telnetd -k
  #shell		stream	tcp	nowait	root	/usr/libexec/rshd	rshd -L
  #login		stream	tcp	nowait	root	/usr/libexec/rlogind	rlogind
  #exec		stream	tcp	nowait	root	/usr/libexec/rexecd	rexecd
  #uucpd		stream	tcp	nowait	root	/usr/libexec/uucpd	uucpd
  #finger		stream	tcp	nowait	nobody	/usr/libexec/fingerd	fingerd -lsm
  ident		stream	tcp	nowait	nobody	/usr/libexec/identd	identd -elo
  #tftp		dgram	udp	wait	root	/usr/libexec/tftpd	tftpd -s /tftpboot
  comsat		dgram	udp	wait	root	/usr/libexec/comsat	comsat
  #ntalk		dgram	udp	wait	root	/usr/libexec/ntalkd	ntalkd
  #bootps		dgram	udp	wait	root	/usr/sbin/bootpd	bootpd
  # Internal services
  #echo		stream	tcp	nowait	root	internal
  #discard	stream	tcp	nowait	root	internal
  #chargen	stream	tcp	nowait	root	internal
  daytime		stream	tcp	nowait	root	internal
  time		stream	tcp	nowait	root	internal
  #echo		dgram	udp	wait	root	internal
  #discard	dgram	udp	wait	root	internal
  #chargen	dgram	udp	wait	root	internal
  #daytime	dgram	udp	wait	root	internal
  #time		dgram	udp	wait	root	internal
  # Kerberos authenticated services
  #klogin		stream	tcp	nowait	root	/usr/libexec/rlogind	rlogind -k
  #eklogin	stream	tcp	nowait	root	/usr/libexec/rlogind	rlogind -kx
--- 1,49 ----
! #	$OpenBSD: inetd.conf,v 1.39 2001/03/08 01:24:02 itojun Exp $
  #
  # Internet server configuration database
  #
+ # define *both* IPv4 and IPv6 entries for dual-stack support.
+ #
  #ftp		stream	tcp	nowait	root	/usr/libexec/ftpd	ftpd -US
+ #ftp		stream	tcp6	nowait	root	/usr/libexec/ftpd	ftpd -US
  #telnet		stream	tcp	nowait	root	/usr/libexec/telnetd	telnetd -k
+ #telnet		stream	tcp6	nowait	root	/usr/libexec/telnetd	telnetd -k
  #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
+ #login		stream	tcp6	nowait	root	/usr/libexec/rlogind	rlogind
  #exec		stream	tcp	nowait	root	/usr/libexec/rexecd	rexecd
  #uucpd		stream	tcp	nowait	root	/usr/libexec/uucpd	uucpd
  #finger		stream	tcp	nowait	nobody	/usr/libexec/fingerd	fingerd -lsm
+ #finger		stream	tcp6	nowait	nobody	/usr/libexec/fingerd	fingerd -lsm
  ident		stream	tcp	nowait	nobody	/usr/libexec/identd	identd -elo
+ ident		stream	tcp6	nowait	nobody	/usr/libexec/identd	identd -elo
  #tftp		dgram	udp	wait	root	/usr/libexec/tftpd	tftpd -s /tftpboot
  comsat		dgram	udp	wait	root	/usr/libexec/comsat	comsat
+ comsat		dgram	udp6	wait	root	/usr/libexec/comsat	comsat
  #ntalk		dgram	udp	wait	root	/usr/libexec/ntalkd	ntalkd
  #bootps		dgram	udp	wait	root	/usr/sbin/bootpd	bootpd
  # Internal services
  #echo		stream	tcp	nowait	root	internal
+ #echo		stream	tcp6	nowait	root	internal
  #discard	stream	tcp	nowait	root	internal
+ #discard	stream	tcp6	nowait	root	internal
  #chargen	stream	tcp	nowait	root	internal
+ #chargen	stream	tcp6	nowait	root	internal
  daytime		stream	tcp	nowait	root	internal
+ daytime		stream	tcp6	nowait	root	internal
  time		stream	tcp	nowait	root	internal
+ time		stream	tcp6	nowait	root	internal
  #echo		dgram	udp	wait	root	internal
+ #echo		dgram	udp6	wait	root	internal
  #discard	dgram	udp	wait	root	internal
+ #discard	dgram	udp6	wait	root	internal
  #chargen	dgram	udp	wait	root	internal
+ #chargen	dgram	udp6	wait	root	internal
  #daytime	dgram	udp	wait	root	internal
+ #daytime	dgram	udp6	wait	root	internal
  #time		dgram	udp	wait	root	internal
+ #time		dgram	udp6	wait	root	internal
  # Kerberos authenticated services
  #klogin		stream	tcp	nowait	root	/usr/libexec/rlogind	rlogind -k
  #eklogin	stream	tcp	nowait	root	/usr/libexec/rlogind	rlogind -kx
***************
*** 40,50 ****
  #walld/1	dgram	rpc/udp	wait	root	/usr/libexec/rpc.rwalld	rpc.rwalld
  #sprayd/1	dgram	rpc/udp	wait	root	/usr/libexec/rpc.sprayd	rpc.sprayd
  #rquotad/1	dgram	rpc/udp	wait	root	/usr/libexec/rpc.rquotad rpc.rquotad
- # IPv6 entry examples.
- # define *both* IPv4 and IPv6 entries for dual-stack support.
- #ftp		stream	tcp6	nowait	root	/usr/libexec/ftpd	ftpd -US
- #telnet		stream	tcp6	nowait	root	/usr/libexec/telnetd	telnetd -k
- #shell		stream	tcp6	nowait	root	/usr/libexec/rshd	rshd -L
- #login		stream	tcp6	nowait	root	/usr/libexec/rlogind	rlogind
- #finger		stream	tcp6	nowait	nobody	/usr/libexec/fingerd	fingerd -lsm
- ident		stream	tcp6	nowait	nobody	/usr/libexec/identd	identd -elo
--- 59,61 ----