diff -c -P --recursive --exclude=COPYRIGHT --exclude=COPYING netbase.orig/inetd-5.30.orig/Makefile netbase/inetd-5.30/Makefile
*** netbase.orig/inetd-5.30.orig/Makefile	Thu Jan  1 01:00:00 1970
--- netbase/inetd-5.30/Makefile	Wed Aug 23 22:05:51 1995
***************
*** 0 ****
--- 1,15 ----
+ CC = gcc
+ CFLAGS = -O2 -fomit-frame-pointer -m486 -include /usr/include/bsd/bsd.h \
+ 	-I/usr/include/bsd
+ LDFLAGS = -s
+ LDLIBS = -lbsd
+ 
+ inetd: inetd.o
+ 
+ install: inetd
+ 	install -o root -g root -m 0744 inetd /usr/sbin
+ 	install -o root -g root -m 0644 inetd.8 /usr/man/man8
+ 	install -o root -g root -m 0644 inetd.conf.5 /usr/man/man5
+ 
+ clean:
+ 	rm -f *.o inetd
diff -c -P --recursive --exclude=COPYRIGHT --exclude=COPYING netbase.orig/inetd-5.30.orig/debian.README netbase/inetd-5.30/debian.README
*** netbase.orig/inetd-5.30.orig/debian.README	Thu Jan  1 01:00:00 1970
--- netbase/inetd-5.30/debian.README	Mon Apr 18 04:09:19 1994
***************
*** 0 ****
--- 1,9 ----
+ Last update: 04/18/94
+ 
+ The following things have been changed for the Debian distribution:
+ 
+ - applied a patch from Florian La Roche <rzsfl@rz.uni-sb.de>
+ - changed the makefile (install target)
+ 
+ 
+ Peter Tobias (tobias@server.et-inf.fho-emden.de)
diff -c -P --recursive --exclude=COPYRIGHT --exclude=COPYING netbase.orig/inetd-5.30.orig/inetd.c netbase/inetd-5.30/inetd.c
*** netbase.orig/inetd-5.30.orig/inetd.c	Fri Dec 17 08:26:06 1993
--- netbase/inetd-5.30/inetd.c	Sun May 22 23:17:46 1994
***************
*** 120,128 ****
--- 120,130 ----
  #include <sys/time.h>
  #include <sys/resource.h>
  
+ #ifndef __linux__
  #ifndef RLIMIT_NOFILE
  #define RLIMIT_NOFILE	RLIMIT_OFILE
  #endif
+ #endif
  
  #define RPC
  
***************
*** 375,386 ****
  		if (debug)
  			fprintf(stderr, "someone wants %s\n", sep->se_service);
  		if (!sep->se_wait && sep->se_socktype == SOCK_STREAM) {
  			ctrl = accept(sep->se_fd, (struct sockaddr *)0,
  			    (int *)0);
  			if (debug)
  				fprintf(stderr, "accept, ctrl %d\n", ctrl);
  			if (ctrl < 0) {
! 				if (errno == EINTR)
  					continue;
  				syslog(LOG_WARNING, "accept (for %s): %m",
  					sep->se_service);
--- 377,392 ----
  		if (debug)
  			fprintf(stderr, "someone wants %s\n", sep->se_service);
  		if (!sep->se_wait && sep->se_socktype == SOCK_STREAM) {
+ 			/* Fixed AGC */
+ 			fcntl(sep->se_fd,F_SETFL,O_NDELAY);
+ 			/* --------- */
  			ctrl = accept(sep->se_fd, (struct sockaddr *)0,
  			    (int *)0);
+ 			fcntl(sep->se_fd,F_SETFL, 0);
  			if (debug)
  				fprintf(stderr, "accept, ctrl %d\n", ctrl);
  			if (ctrl < 0) {
! 				if (errno == EINTR || errno == EWOULDBLOCK)
  					continue;
  				syslog(LOG_WARNING, "accept (for %s): %m",
  					sep->se_service);
diff -c -P --recursive --exclude=COPYRIGHT --exclude=COPYING netbase.orig/inetd-5.30.orig/inetd.conf.5 netbase/inetd-5.30/inetd.conf.5
*** netbase.orig/inetd-5.30.orig/inetd.conf.5	Thu Jan  1 01:00:00 1970
--- netbase/inetd-5.30/inetd.conf.5	Wed Aug 23 22:05:35 1995
***************
*** 0 ****
--- 1,224 ----
+ .\" Copyright (c) 1985, 1991 The Regents of the University of California.
+ .\" All rights reserved.
+ .\"
+ .\" Redistribution and use in source and binary forms, with or without
+ .\" modification, are permitted provided that the following conditions
+ .\" are met:
+ .\" 1. Redistributions of source code must retain the above copyright
+ .\"    notice, this list of conditions and the following disclaimer.
+ .\" 2. Redistributions in binary form must reproduce the above copyright
+ .\"    notice, this list of conditions and the following disclaimer in the
+ .\"    documentation and/or other materials provided with the distribution.
+ .\" 3. All advertising materials mentioning features or use of this software
+ .\"    must display the following acknowledgement:
+ .\"	This product includes software developed by the University of
+ .\"	California, Berkeley and its contributors.
+ .\" 4. Neither the name of the University nor the names of its contributors
+ .\"    may be used to endorse or promote products derived from this software
+ .\"    without specific prior written permission.
+ .\"
+ .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ .\" SUCH DAMAGE.
+ .\"
+ .\"     from: @(#)inetd.8	6.7 (Berkeley) 3/16/91
+ .\"	$Id: inetd.8,v 1.4 1993/10/13 11:22:48 pk Exp $
+ .\"
+ .Dd March 16, 1991
+ .Dt INETD.CONF 5
+ .Os BSD 4.3
+ .Sh NAME
+ inetd.conf \- Internet servers database
+ .Sh DESCRIPTION
+ Upon execution,
+ .Nm inetd
+ reads its configuration information from a configuration
+ file which, by default, is
+ .Pa /etc/inetd.conf .
+ There must be an entry for each field of the configuration
+ file, with entries for each field separated by a tab or
+ a space.  Comments are denoted by a ``#'' at the beginning
+ of a line.  There must be an entry for each field.  The
+ fields of the configuration file are as follows:
+ .Pp
+ .Bd -unfilled -offset indent -compact
+ service name
+ socket type
+ protocol
+ wait/nowait[.max]
+ user[.group]
+ server program
+ server program arguments
+ .Ed
+ .Pp
+ To specify an 
+ .Em Sun-RPC 
+ based service, the entry would contain these fields.
+ .Pp
+ .Bd -unfilled -offset indent -compact
+ service name/version
+ socket type
+ rpc/protocol
+ wait/nowait[.max]
+ user[.group]
+ server program
+ server program arguments
+ .Ed
+ .Pp
+ The
+ .Em service-name
+ entry is the name of a valid service in
+ the file
+ .Pa /etc/services .
+ For
+ .Dq internal
+ services (discussed below), the service
+ name
+ .Em must
+ be the official name of the service (that is, the first entry in
+ .Pa /etc/services ) . 
+ When used to specify a
+ .Em Sun-RPC
+ based service, this field is a valid RPC service name in
+ the file
+ .Pa /etc/rpc . 
+ The part on the right of the 
+ .Dq /
+ is the RPC version number. This
+ can simply be a single numeric argument or a range of versions.
+ A range is bounded by the low version to the high version - 
+ .Dq rusers/1-3 .
+ 
+ .Pp
+ The
+ .Em socket-type
+ should be one of
+ .Dq stream ,
+ .Dq dgram ,
+ .Dq raw ,
+ .Dq rdm ,
+ or
+ .Dq seqpacket ,
+ depending on whether the socket is a stream, datagram, raw,
+ reliably delivered message, or sequenced packet socket.
+ .Pp
+ The
+ .Em protocol
+ must be a valid protocol as given in
+ .Pa /etc/protocols .
+ Examples might be
+ .Dq tcp
+ or
+ .Dq udp .
+ Rpc based services are specified with the 
+ .Dq rpc/tcp
+ or 
+ .Dq rpc/udp 
+ service type.
+ 
+ .Pp
+ The
+ .Em wait/nowait
+ entry is applicable to datagram sockets only (other sockets should
+ have a
+ .Dq nowait
+ entry in this space).  If a datagram server connects
+ to its peer, freeing the socket so
+ .Nm inetd
+ can received further messages on the socket, it is said to be
+ a
+ .Dq multi-threaded
+ server, and should use the
+ .Dq nowait
+ entry.  For datagram servers which process all incoming datagrams
+ on a socket and eventually time out, the server is said to be
+ .Dq single-threaded
+ and should use a
+ .Dq wait
+ entry.
+ .Xr Comsat 8
+ .Pq Xr biff 1
+ and
+ .Xr talkd 8
+ are both examples of the latter type of
+ datagram server.
+ .Xr Tftpd 8
+ is an exception; it is a datagram server that establishes pseudo-connections.
+ It must be listed as
+ .Dq wait
+ in order to avoid a race;
+ the server reads the first packet, creates a new socket,
+ and then forks and exits to allow
+ .Nm inetd
+ to check for new service requests to spawn new servers.
+ The optional
+ .Dq max
+ suffix (separated from
+ .Dq wait
+ or
+ .Dq nowait
+ by a dot) specifies the maximum number of server instances that may be
+ spawned from
+ .Nm inetd
+ within an interval of 60 seconds. When omitted,
+ .Dq max
+ defaults to 40.
+ .Pp
+ The
+ .Em user
+ entry should contain the user name of the user as whom the server
+ should run.  This allows for servers to be given less permission
+ than root. An optional group name can be specified by appending a dot to
+ the user name followed by the group name. This allows for servers to run with
+ a different (primary) group id than specified in the password file. If a group
+ is specified and user is not root, the supplementary groups associated with
+ that user will still be set.
+ .Pp
+ The
+ .Em server-program
+ entry should contain the pathname of the program which is to be
+ executed by
+ .Nm inetd
+ when a request is found on its socket.  If
+ .Nm inetd
+ provides this service internally, this entry should
+ be
+ .Dq internal .
+ .Pp
+ The
+ .Em server program arguments
+ should be just as arguments
+ normally are, starting with argv[0], which is the name of
+ the program.  If the service is provided internally, the
+ word
+ .Dq internal
+ should take the place of this entry.
+ .Pp
+ .Nm Inetd
+ provides several
+ .Dq trivial
+ services internally by use of
+ routines within itself.  These services are
+ .Dq echo ,
+ .Dq discard ,
+ .Dq chargen
+ (character generator),
+ .Dq daytime
+ (human readable time), and
+ .Dq time
+ (machine readable time,
+ in the form of the number of seconds since midnight, January
+ 1, 1900).  All of these services are tcp based.  For
+ details of these services, consult the appropriate
+ .Tn RFC
+ from the Network Information Center.
+ .Sh SEE ALSO
+ .Xr inetd 8
