Index: create.patch.sh
===================================================================
--- create.patch.sh (nonexistent)
+++ create.patch.sh (revision 5)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+VERSION=1.79
+
+tar --files-from=file.list -xzvf ../inetd-OpenBSD-$VERSION.tar.gz
+mv inetd inetd-orig
+
+cp -rf ./inetd-new ./inetd
+
+diff --unified -Nr inetd-orig inetd > inetd-OpenBSD-$VERSION-BSD.patch
+
+mv inetd-OpenBSD-$VERSION-BSD.patch ../patches
+
+rm -rf ./inetd
+rm -rf ./inetd-orig
Property changes on: create.patch.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: file.list
===================================================================
--- file.list (nonexistent)
+++ file.list (revision 5)
@@ -0,0 +1,2 @@
+inetd/inetd.8
+inetd/inetd.c
Index: inetd-new/inetd.8
===================================================================
--- inetd-new/inetd.8 (nonexistent)
+++ inetd-new/inetd.8 (revision 5)
@@ -0,0 +1,403 @@
+.\" 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.18 2001/01/29 11:38:32 deraadt Exp $
+.\"
+.Dd March 16, 1991
+.Dt INETD 8
+.Os
+.Sh NAME
+.Nm inetd
+.Nd internet
+.Dq super-server
+.Sh SYNOPSIS
+.Nm inetd
+.Op Fl d
+.Op Fl R Ar rate
+.Op Ar configuration file
+.Sh DESCRIPTION
+.Nm inetd
+should be run at boot time by
+.Pa /etc/rc
+(see
+.Xr rc 8 ) .
+It then listens for connections on certain internet sockets.
+When a connection is found on one
+of its sockets, it decides what service the socket
+corresponds to, and invokes a program to service the request.
+After the program is
+finished, it continues to listen on the socket (except in some cases which
+will be described below).
+Essentially,
+.Nm inetd
+allows running one daemon to invoke several others,
+reducing load on the system.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl d
+Turns on debugging.
+.It Fl R Ar rate
+Specify the maximum number of times a service can be invoked
+in one minute; the default is unlimited. A rate of 0 allows an
+unlimited number of invocations.
+.El
+.Pp
+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
+.Dq #
+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] or user[:group]
+server program
+server program arguments
+.Ed
+.Pp
+To specify a 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] or user[:group]
+server program
+server program arguments
+.Ed
+.Pp
+For internet services, the first field of the line may also have a host
+address specifier prefixed to it, separated from the service name by a
+colon.
+If this is done, the string before the colon in the first field
+indicates what local address
+.Nm
+should use when listening for that service.
+Multiple local addresses
+can be specified on the same line, separated by commas.
+Numeric IP
+addresses in dotted-quad notation can be used as well as symbolic
+hostnames.
+Symbolic hostnames are looked up using
+.Fn gethostbyname .
+If a hostname has multiple address mappings, inetd creates a socket
+to listen on each address.
+.Pp
+The single character
+.Dq \&*
+indicates
+.Dv INADDR_ANY ,
+meaning
+.Dq all local addresses .
+To avoid repeating an address that occurs frequently, a line with a
+host address specifier and colon, but no further fields, causes the
+host address specifier to be remembered and used for all further lines
+with no explicit host specifier (until another such line or the end of
+the file).
+A line
+.Dl *:
+is implicitly provided at the top of the file; thus, traditional
+configuration files (which have no host address specifiers) will be
+interpreted in the traditional manner, with all services listened for
+on all local addresses.
+.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 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.
+.Dq tcp
+and
+.Dq udp
+will be recognized as
+.Dq TCP or UDP over default IP version .
+It is currently IPv4, but in the future it will be IPv6.
+If you need to specify IPv4 or IPv6 explicitly, use something like
+.Dq tcp4
+or
+.Dq udp6 .
+.Pp
+The
+.Em wait/nowait
+entry is used to tell
+.Nm
+if it should wait for the server program to return,
+or continue processing connections on the socket.
+If a datagram server connects
+to its peer, freeing the socket so
+.Nm inetd
+can receive 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.
+The default is unlimited (setting a limit may actually make it easier for
+an attacker to create a denial-of-service, and is not recommended).
+.Pp
+Stream servers are usually marked as
+.Dq nowait
+but if a single server process is to handle multiple connections, it may be
+marked as
+.Dq wait .
+The master socket will then be passed as fd 0 to the server, which will then
+need to accept the incoming connection.
+The server should eventually time
+out and exit when no more connections are active.
+.Nm
+will continue to
+listen on the master socket for connections, so the server should not close
+it when it exits.
+.Xr identd 8
+is usually the only stream server marked as wait.
+.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.
+.Pp
+.Nm inetd
+rereads its configuration file when it receives a hangup signal,
+.Dv SIGHUP .
+Services may be added, deleted or modified when the configuration file
+is reread.
+.Nm inetd
+creates a file
+.Em /var/run/inetd.pid
+that contains its process identifier.
+.Ss IPv6 TCP/UDP behavior
+If you wish to run a server for IPv4 and IPv6 traffic,
+you'll need to run two separate process for the same server program,
+specified as two separate lines on
+.Pa inetd.conf ,
+for
+.Dq tcp4
+and
+.Dq tcp6 .
+.Pp
+Under various combination of IPv4/v6 daemon settings,
+.Nm
+will behave as follows:
+.Bl -bullet -compact
+.It
+If you have only one server on
+.Dq tcp4 ,
+IPv4 traffic will be routed to the server.
+IPv6 traffic will not be accepted.
+.It
+If you have two servers on
+.Dq tcp4
+and
+.Dq tcp6 ,
+IPv4 traffic will be routed to the server on
+.Dq tcp4 ,
+and IPv6 traffic will go to server on
+.Dq tcp6 .
+.It
+If you have only one server on
+.Dq tcp6 ,
+only IPv6 traffic will be routed to the server.
+.El
+.Sh BUGS
+Host address specifiers, while they make conceptual sense for RPC
+services, do not work entirely correctly.
+This is largely because the
+portmapper interface does not provide a way to register different ports
+for the same service on different local addresses.
+Provided you never
+have more than one entry for a given RPC service, everything should
+work correctly.
+(Note that default host address specifiers do apply to
+RPC lines with no explicit specifier.)
+.Pp
+.Dq rpc
+or
+.Dq tcpmux
+on IPv6 is not tested enough.
+Kerberos support on IPv6 is not tested.
+.Sh SEE ALSO
+.Xr comsat 8 ,
+.Xr fingerd 8 ,
+.Xr ftpd 8 ,
+.Xr rexecd 8 ,
+.Xr rlogind 8 ,
+.Xr rshd 8 ,
+.Xr telnetd 8 ,
+.Xr tftpd 8
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.3 .
+Support for Sun-RPC
+based services is modeled after that
+provided by SunOS 4.1.
+IPv6 support and IPsec hack was made by KAME project, in 1999.
Index: inetd-new/inetd.c
===================================================================
--- inetd-new/inetd.c (nonexistent)
+++ inetd-new/inetd.c (revision 5)
@@ -0,0 +1,2161 @@
+/* $Slackware: inetd.c 1.79s 2001/02/06 13:18:00 volkerdi Exp $ */
+/* $OpenBSD: inetd.c,v 1.79 2001/01/30 08:30:57 deraadt Exp $ */
+/* $NetBSD: inetd.c,v 1.11 1996/02/22 11:14:41 mycroft Exp $ */
+/*
+ * Copyright (c) 1983,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.
+ */
+
+#ifndef lint
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "from: @(#)inetd.c 5.30 (Berkeley) 6/3/91";
+static char rcsid[] = "$OpenBSD: inetd.c,v 1.79 2001/01/30 08:30:57 deraadt Exp $";
+static char xtraid[] = "$Slackware: inetd.c 1.79s 2001/02/06 13:18:00 volkerdi Exp $";
+#endif /* not lint */
+
+/*
+ * Inetd - Internet super-server
+ *
+ * This program invokes all internet services as needed.
+ * connection-oriented services are invoked each time a
+ * connection is made, by creating a process. This process
+ * is passed the connection as file descriptor 0 and is
+ * expected to do a getpeername to find out the source host
+ * and port.
+ *
+ * Datagram oriented services are invoked when a datagram
+ * arrives; a process is created and passed a pending message
+ * on file descriptor 0. Datagram servers may either connect
+ * to their peer, freeing up the original socket for inetd
+ * to receive further messages on, or ``take over the socket'',
+ * processing all arriving datagrams and, eventually, timing
+ * out. The first type of server is said to be ``multi-threaded'';
+ * the second type of server ``single-threaded''.
+ *
+ * Inetd uses a configuration file which is read at startup
+ * and, possibly, at some later time in response to a hangup signal.
+ * The configuration file is ``free format'' with fields given in the
+ * order shown below. Continuation lines for an entry must begin with
+ * a space or tab. All fields must be present in each entry.
+ *
+ * service name must be in /etc/services
+ * socket type stream/dgram/raw/rdm/seqpacket
+ * protocol must be in /etc/protocols
+ * wait/nowait[.max] single-threaded/multi-threaded, max #
+ * user[.group] or user[:group] user/group to run daemon as
+ * server program full path name
+ * server program arguments maximum of MAXARGS (20)
+ *
+ * For RPC services
+ * service name/version must be in /etc/rpc
+ * socket type stream/dgram/raw/rdm/seqpacket
+ * protocol must be in /etc/protocols
+ * wait/nowait[.max] single-threaded/multi-threaded
+ * user[.group] or user[:group] user to run daemon as
+ * server program full path name
+ * server program arguments maximum of MAXARGS (20)
+ *
+ * For non-RPC services, the "service name" can be of the form
+ * hostaddress:servicename, in which case the hostaddress is used
+ * as the host portion of the address to listen on. If hostaddress
+ * consists of a single `*' character, INADDR_ANY is used.
+ *
+ * A line can also consist of just
+ * hostaddress:
+ * where hostaddress is as in the preceding paragraph. Such a line must
+ * have no further fields; the specified hostaddress is remembered and
+ * used for all further lines that have no hostaddress specified,
+ * until the next such line (or EOF). (This is why * is provided to
+ * allow explicit specification of INADDR_ANY.) A line
+ * *:
+ * is implicitly in effect at the beginning of the file.
+ *
+ * The hostaddress specifier may (and often will) contain dots;
+ * the service name must not.
+ *
+ * For RPC services, host-address specifiers are accepted and will
+ * work to some extent; however, because of limitations in the
+ * portmapper interface, it will not work to try to give more than
+ * one line for any given RPC service, even if the host-address
+ * specifiers are different.
+ *
+ * Comment lines are indicated by a `#' in column 1.
+ */
+
+/*
+ * Here's the scoop concerning the user[.:]group feature:
+ *
+ * 1) set-group-option off.
+ *
+ * a) user = root: NO setuid() or setgid() is done
+ *
+ * b) other: setgid(primary group as found in passwd)
+ * initgroups(name, primary group)
+ * setuid()
+ *
+ * 2) set-group-option on.
+ *
+ * a) user = root: setgid(specified group)
+ * NO initgroups()
+ * NO setuid()
+ *
+ * b) other: setgid(specified group)
+ * initgroups(name, specified group)
+ * setuid()
+ *
+ */
+
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/file.h>
+#include <sys/wait.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+
+#ifndef RLIMIT_NOFILE
+#define RLIMIT_NOFILE RLIMIT_OFILE
+#endif
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <errno.h>
+#include <signal.h>
+#include <netdb.h>
+#include <syslog.h>
+#include <pwd.h>
+#include <grp.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <time.h>
+/* #include <login_cap.h> */
+#include <rpc/rpc.h>
+#include <rpc/pmap_clnt.h>
+#include <rpcsvc/nfs_prot.h>
+#include "pathnames.h"
+
+#define TOOMANY 0 /* don't start more than TOOMANY */
+ /* zero disables this stupid "feature" */
+#define CNT_INTVL 60 /* servers in CNT_INTVL sec. */
+#define RETRYTIME (60*10) /* retry after bind or server fail */
+
+#define SIGBLOCK (sigmask(SIGCHLD)|sigmask(SIGHUP)|sigmask(SIGALRM))
+
+void config __P((int));
+/* void doconfig __P((void)); */
+/* void reap __P((int)); */
+/* void doreap __P((void)); */
+void reapchild __P ((int));
+void retry __P((int));
+/* void doretry __P((void)); */
+void goaway __P((int));
+
+static int debug = 0;
+static int global_queuelen = 128;
+int nsock, maxsock;
+/* fd_set *allsockp; */
+fd_set allsock;
+/* int allsockn; */
+int toomany = TOOMANY;
+int options;
+int timingout;
+struct servent *sp;
+char *curdom;
+uid_t uid;
+
+#ifndef OPEN_MAX
+#define OPEN_MAX 64
+#endif
+
+/* Reserve some descriptors, 3 stdio + at least: 1 log, 1 conf. file */
+#define FD_MARGIN (8)
+typeof(((struct rlimit *)0)->rlim_cur) rlim_ofile_cur = OPEN_MAX;
+
+#ifdef RLIMIT_NOFILE
+struct rlimit rlim_ofile;
+#endif
+
+struct servtab {
+ char *se_hostaddr; /* host address to listen on */
+ char *se_service; /* name of service */
+ int se_socktype; /* type of socket to use */
+ int se_family; /* address family */
+ char *se_proto; /* protocol used */
+ int se_rpcprog; /* rpc program number */
+ int se_rpcversl; /* rpc program lowest version */
+ int se_rpcversh; /* rpc program highest version */
+#define isrpcservice(sep) ((sep)->se_rpcversl != 0)
+ pid_t se_wait; /* single threaded server */
+ short se_checked; /* looked at during merge */
+ char *se_user; /* user name to run as */
+ char *se_group; /* group name to run as */
+ struct biltin *se_bi; /* if built-in, description */
+ char *se_server; /* server program */
+#define MAXARGV 20
+ char *se_argv[MAXARGV+1]; /* program arguments */
+ int se_fd; /* open descriptor */
+ union {
+ struct sockaddr se_un_ctrladdr;
+ struct sockaddr_in se_un_ctrladdr_in;
+ struct sockaddr_in6 se_un_ctrladdr_in6;
+ struct sockaddr_un se_un_ctrladdr_un;
+ /* struct sockaddr_storage se_un_ctrladdr_storage; */
+ } se_un; /* bound address */
+#define se_ctrladdr se_un.se_un_ctrladdr
+#define se_ctrladdr_in se_un.se_un_ctrladdr_in
+#define se_ctrladdr_in6 se_un.se_un_ctrladdr_in6
+#define se_ctrladdr_un se_un.se_un_ctrladdr_un
+/* #define se_ctrladdr_storage se_un.se_un_ctrladdr_storage */
+ int se_ctrladdr_size;
+ int se_max; /* max # of instances of this service */
+ int se_count; /* number started since se_time */
+ struct timeval se_time; /* start of se_count */
+ struct servtab *se_next;
+} *servtab;
+
+void echo_stream __P((int, struct servtab *));
+void discard_stream __P((int, struct servtab *));
+void machtime_stream __P((int, struct servtab *));
+void daytime_stream __P((int, struct servtab *));
+void chargen_stream __P((int, struct servtab *));
+void echo_dg __P((int, struct servtab *));
+void discard_dg __P((int, struct servtab *));
+void machtime_dg __P((int, struct servtab *));
+void daytime_dg __P((int, struct servtab *));
+void chargen_dg __P((int, struct servtab *));
+
+struct biltin {
+ char *bi_service; /* internally provided service name */
+ int bi_socktype; /* type of socket supported */
+ short bi_fork; /* 1 if should fork before call */
+ short bi_wait; /* 1 if should wait for child */
+ void (*bi_fn) __P((int, struct servtab *));
+} biltins[] = {
+ /* Echo received data */
+ { "echo", SOCK_STREAM, 1, 0, echo_stream },
+ { "echo", SOCK_DGRAM, 0, 0, echo_dg },
+
+ /* Internet /dev/null */
+ { "discard", SOCK_STREAM, 1, 0, discard_stream },
+ { "discard", SOCK_DGRAM, 0, 0, discard_dg },
+
+ /* Return 32 bit time since 1900 */
+ { "time", SOCK_STREAM, 0, 0, machtime_stream },
+ { "time", SOCK_DGRAM, 0, 0, machtime_dg },
+
+ /* Return human-readable time */
+ { "daytime", SOCK_STREAM, 0, 0, daytime_stream },
+ { "daytime", SOCK_DGRAM, 0, 0, daytime_dg },
+
+ /* Familiar character generator */
+ { "chargen", SOCK_STREAM, 1, 0, chargen_stream },
+ { "chargen", SOCK_DGRAM, 0, 0, chargen_dg },
+
+ { NULL, 0, 0, 0, NULL }
+};
+
+/* sig_atomic_t wantretry; */
+/* sig_atomic_t wantconfig; */
+/* sig_atomic_t wantreap; */
+
+#define NUMINT (sizeof(intab) / sizeof(struct inent))
+char *CONFIG = _PATH_INETDCONF;
+char **Argv;
+char *LastArg;
+char *progname;
+
+void logpid __P((void));
+
+/* This function is unused in the Linux port */
+#ifdef OpenBSD
+void
+fd_grow(fd_set **fdsp, int *bytes, int fd)
+{
+ caddr_t new;
+ int newbytes;
+
+ newbytes = howmany(fd+1, NFDBITS) * sizeof(fd_mask);
+ if (newbytes > *bytes) {
+ newbytes *= 2; /* optimism */
+ new = realloc(*fdsp, newbytes);
+ if (new == NULL) {
+ syslog(LOG_ERR, "Out of memory.");
+ exit(1);
+ }
+ memset(new + *bytes, 0, newbytes - *bytes);
+ *fdsp = (fd_set *)new;
+ *bytes = newbytes;
+ }
+}
+#endif
+
+int
+main(argc, argv, envp)
+ int argc;
+ char *argv[], *envp[];
+{
+ /* extern char *optarg; */
+ /* extern int optind; */
+ register struct servtab *sep;
+ register struct passwd *pwd;
+ register struct group *grp = NULL;
+ register int tmpint;
+ struct sigaction sa, sapipe;
+ int ch, dofork;
+ int nodaemon = 0;
+ pid_t pid;
+ char buf[50];
+ /* fd_set *readablep = NULL; */
+ /* int readablen = 0; */
+
+ Argv = argv;
+ if (envp == 0 || *envp == 0)
+ envp = argv;
+ while (*envp)
+ envp++;
+ LastArg = envp[-1] + strlen(envp[-1]);
+
+ progname = strrchr(argv[0], '/');
+ progname = progname ? progname + 1 : argv[0];
+
+ while ((ch = getopt(argc, argv, "dR:")) != -1)
+ switch(ch) {
+ case 'd':
+ debug = 1;
+ options |= SO_DEBUG;
+ break;
+ case 'R': { /* invocation rate */
+ char *p;
+ int val;
+
+ val = strtoul(optarg, &p, 0);
+ if (val >= 0 && *p == (char) 0) {
+ toomany = val;
+ break;
+ }
+ syslog(LOG_ERR,
+ "-R %s: bad value for service invocation rate",
+ optarg);
+ break;
+ }
+ case '?':
+ default:
+ fprintf(stderr, "usage: %s [-R rate] [-d] [conf]\n",
+ progname);
+ exit(1);
+ }
+ argc -= optind;
+ argv += optind;
+
+ uid = getuid();
+ if (uid != 0)
+ CONFIG = NULL;
+ if (argc > 0)
+ CONFIG = argv[0];
+ if (CONFIG == NULL) {
+ fprintf(stderr, "%s: non-root must specify a config file\n",
+ progname);
+ exit(1);
+ }
+
+ if (nodaemon == 0)
+ daemon (0, 0);
+ else if (debug == 0) {
+ /* daemon(0, 0); */
+ /* if (uid == 0) */
+ /* (void) setlogin(""); */
+ setsid ();
+ }
+
+ if (uid == 0) {
+ gid_t gid = getgid();
+
+ /* If run by hand, ensure groups vector gets trashed */
+ setgroups(1, &gid);
+ }
+
+ openlog(progname, LOG_PID | LOG_NOWAIT, LOG_DAEMON);
+ logpid();
+
+#ifdef RLIMIT_NOFILE
+ if (getrlimit(RLIMIT_NOFILE, &rlim_ofile) < 0) {
+ syslog(LOG_ERR, "getrlimit: %m");
+ } else {
+ rlim_ofile_cur = rlim_ofile.rlim_cur;
+ if (rlim_ofile_cur == RLIM_INFINITY) /* ! */
+ rlim_ofile_cur = OPEN_MAX;
+ }
+#endif
+
+ memset((char *)&sa, 0, sizeof(sa));
+ sigemptyset(&sa.sa_mask);
+ sigaddset(&sa.sa_mask, SIGALRM);
+ sigaddset(&sa.sa_mask, SIGCHLD);
+ sigaddset(&sa.sa_mask, SIGHUP);
+ sa.sa_handler = retry;
+ sigaction(SIGALRM, &sa, NULL);
+ /* doconfig(); */
+ config (SIGHUP);
+ sa.sa_handler = config;
+ sigaction(SIGHUP, &sa, NULL);
+ /* sa.sa_handler = reap; */
+ sa.sa_handler = reapchild;
+ sigaction(SIGCHLD, &sa, NULL);
+ sa.sa_handler = goaway;
+ sigaction(SIGTERM, &sa, NULL);
+ sa.sa_handler = goaway;
+ sigaction(SIGINT, &sa, NULL);
+ sa.sa_handler = SIG_IGN;
+ sigaction(SIGPIPE, &sa, &sapipe);
+
+ {
+ /* space for daemons to overwrite environment for ps */
+#define DUMMYSIZE 100
+ char dummy[DUMMYSIZE];
+
+ (void)memset(dummy, 'x', DUMMYSIZE - 1);
+ dummy[DUMMYSIZE - 1] = '\0';
+
+ (void)setenv("inetd_dummy", dummy, 1);
+ }
+
+ for (;;) {
+ int n, ctrl = -1;
+ fd_set readable;
+
+ if (nsock == 0) {
+ (void) sigblock(SIGBLOCK);
+ while (nsock == 0)
+ sigpause(0L);
+ (void) sigsetmask(0L);
+ }
+
+ /* Well, this all looks like cruft to me ;^) */
+#ifdef OpenBSD
+ if (readablen != allsockn) {
+ if (readablep)
+ free(readablep);
+ readablep = (fd_set *)calloc(allsockn, 1);
+ if (readablep == NULL) {
+ syslog(LOG_ERR, "Out of memory.");
+ exit(1);
+ }
+ readablen = allsockn;
+ }
+ bcopy(allsockp, readablep, allsockn);
+
+ if (wantretry) {
+ doretry();
+ wantretry = 0;
+ continue;
+ }
+ if (wantconfig) {
+ doconfig();
+ wantconfig = 0;
+ continue;
+ }
+ if (wantreap) {
+ doreap();
+ wantreap = 0;
+ continue;
+ }
+#endif
+
+ readable = allsock;
+ if ((n = select(maxsock + 1, &readable, NULL, NULL, NULL)) <= 0) {
+ if (n < 0 && errno != EINTR) {
+ syslog(LOG_WARNING, "select: %m");
+ sleep(1);
+ }
+ continue;
+ }
+ for (sep = servtab; n && sep; sep = sep->se_next)
+ if (sep->se_fd != -1 && FD_ISSET(sep->se_fd, &readable)) {
+ n--;
+ 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, NULL, NULL);
+ 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);
+ continue;
+ }
+ if (sep->se_family == AF_INET &&
+ sep->se_socktype == SOCK_STREAM) {
+ struct sockaddr_in peer;
+ int plen = sizeof(peer);
+
+ if (getpeername(ctrl, (struct sockaddr *)&peer,
+ &plen) < 0) {
+ syslog(LOG_WARNING, "could not getpeername");
+ close(ctrl);
+ continue;
+ }
+ if (ntohs(peer.sin_port) == 20) {
+ /* XXX ftp bounce */
+ close(ctrl);
+ continue;
+ }
+ }
+ } else
+ ctrl = sep->se_fd;
+ (void) sigblock(SIGBLOCK);
+ pid = 0;
+ dofork = (sep->se_bi == 0 || sep->se_bi->bi_fork);
+ if (dofork) {
+ if (sep->se_count++ == 0)
+ (void)gettimeofday(&sep->se_time, NULL);
+ else if (toomany > 0 && sep->se_count >= sep->se_max) {
+ struct timeval now;
+
+ (void)gettimeofday(&now, NULL);
+ if (now.tv_sec - sep->se_time.tv_sec >
+ CNT_INTVL) {
+ sep->se_time = now;
+ sep->se_count = 1;
+ } else {
+ if (!sep->se_wait &&
+ sep->se_socktype == SOCK_STREAM)
+ close(ctrl);
+ if (sep->se_family == AF_INET &&
+ ntohs(sep->se_ctrladdr_in.sin_port) >=
+ IPPORT_RESERVED) {
+ /*
+ * Cannot close it -- there are
+ * thieves on the system.
+ * Simply ignore the connection.
+ */
+ --sep->se_count;
+ continue;
+ }
+ syslog(LOG_ERR,
+ "%s/%s server failing (looping), service terminated",
+ sep->se_service, sep->se_proto);
+ if (!sep->se_wait &&
+ sep->se_socktype == SOCK_STREAM)
+ close(ctrl);
+ FD_CLR(sep->se_fd, &allsock);
+ (void) close(sep->se_fd);
+ sep->se_fd = -1;
+ sep->se_count = 0;
+ nsock--;
+ sigsetmask(0L);
+ if (!timingout) {
+ timingout = 1;
+ alarm(RETRYTIME);
+ }
+ continue;
+ }
+ }
+ pid = fork();
+ }
+ if (pid < 0) {
+ syslog(LOG_ERR, "fork: %m");
+ if (!sep->se_wait && sep->se_socktype == SOCK_STREAM)
+ close(ctrl);
+ sigsetmask(0L);
+ sleep(1);
+ continue;
+ }
+ if (pid && sep->se_wait) {
+ sep->se_wait = pid;
+ FD_CLR(sep->se_fd, &allsock);
+ nsock--;
+ }
+ sigsetmask(0L);
+ if (pid == 0) {
+ if (sep->se_bi)
+ (*sep->se_bi->bi_fn)(ctrl, sep);
+ else {
+ if ((pwd = getpwnam(sep->se_user)) == NULL) {
+ syslog(LOG_ERR,
+ "getpwnam: %s: No such user",
+ sep->se_user);
+ if (sep->se_socktype != SOCK_STREAM)
+ recv(0, buf, sizeof (buf), 0);
+ _exit(1);
+ }
+ if (setsid() <0)
+ syslog(LOG_ERR, "%s: setsid: %m",
+ sep->se_service);
+ if (sep->se_group &&
+ (grp = getgrnam(sep->se_group)) == NULL) {
+ syslog(LOG_ERR,
+ "getgrnam: %s: No such group",
+ sep->se_group);
+ if (sep->se_socktype != SOCK_STREAM)
+ recv(0, buf, sizeof (buf), 0);
+ _exit(1);
+ }
+ if (uid != 0) {
+ /* a user running private inetd */
+ if (uid != pwd->pw_uid)
+ _exit(1);
+ } else if (pwd->pw_uid) {
+ /* tmpint = LOGIN_SETALL & */
+ /* ~(LOGIN_SETGROUP|LOGIN_SETLOGIN); */
+ /* if (pwd->pw_uid) */
+ /* tmpint |= LOGIN_SETGROUP|LOGIN_SETLOGIN; */
+ if (sep->se_group) {
+ pwd->pw_gid = grp->gr_gid;
+ /* tmpint |= LOGIN_SETGROUP; */
+ }
+ setgid ((gid_t) pwd->pw_gid);
+ initgroups (pwd->pw_name, pwd->pw_gid);
+ setuid ((uid_t) pwd->pw_uid);
+ /* if (setusercontext(0, pwd, pwd->pw_uid, */
+ /* tmpint) < 0) */
+ /* syslog(LOG_ERR, */
+ /* "%s/%s: setusercontext: %m", */
+ /* sep->se_service, */
+ /* sep->se_proto); */
+ } else if (sep->se_group) {
+ setgid (grp->gr_gid);
+ setgroups (1, &grp->gr_gid);
+ }
+ if (debug)
+ fprintf(stderr, "%d execl %s\n",
+ getpid(), sep->se_server);
+ dup2(ctrl, 0);
+ close(ctrl);
+ dup2(0, 1);
+ dup2(0, 2);
+ if (rlim_ofile.rlim_cur != rlim_ofile_cur)
+ if (setrlimit (RLIMIT_NOFILE, &rlim_ofile) < 0)
+ syslog (LOG_ERR, "setrlimit: %m");
+ closelog();
+ for (tmpint = rlim_ofile_cur-1; --tmpint > 2; )
+ (void)close(tmpint);
+ sigaction(SIGPIPE, &sapipe, NULL);
+ execv(sep->se_server, sep->se_argv);
+ if (sep->se_socktype != SOCK_STREAM)
+ recv(0, buf, sizeof (buf), 0);
+ syslog(LOG_ERR, "execv %s: %m", sep->se_server);
+ _exit(1);
+ }
+ }
+ if (!sep->se_wait && sep->se_socktype == SOCK_STREAM)
+ close(ctrl);
+ }
+ }
+}
+
+int
+dg_badinput(sin)
+ struct sockaddr_in *sin;
+{
+ struct in_addr in;
+#ifdef INET6
+ struct in6_addr *in6;
+#endif
+#ifdef OpenBSD
+ u_int16_t port;
+ int i;
+
+ switch (sa->sa_family) {
+ case AF_INET:
+ in.s_addr = ntohl(((struct sockaddr_in *)sa)->sin_addr.s_addr);
+ port = ntohs(((struct sockaddr_in *)sa)->sin_port);
+ v4chk:
+ if (IN_MULTICAST(in.s_addr))
+ goto bad;
+ switch ((in.s_addr & 0xff000000) >> 24) {
+ case 0: case 127: case 255:
+ goto bad;
+ }
+ /* XXX check for subnet broadcast using getifaddrs(3) */
+ break;
+#ifdef INET6
+ case AF_INET6:
+ in6 = &((struct sockaddr_in6 *)sa)->sin6_addr;
+ port = ntohs(((struct sockaddr_in6 *)sa)->sin6_port);
+ if (IN6_IS_ADDR_MULTICAST(in6) || IN6_IS_ADDR_UNSPECIFIED(in6))
+ goto bad;
+ /*
+ * OpenBSD does not support IPv4 mapped adderss (RFC2553
+ * inbound behavior) at all. We should drop it.
+ */
+ if (IN6_IS_ADDR_V4MAPPED(in6))
+ goto bad;
+ if (IN6_IS_ADDR_V4COMPAT(in6)) {
+ memcpy(&in, &in6->s6_addr[12], sizeof(in));
+ in.s_addr = ntohl(in.s_addr);
+ goto v4chk;
+ }
+ break;
+#endif
+ default:
+ /* XXX unsupported af, is it safe to assume it to be safe? */
+ return 0;
+ }
+
+ if (port < IPPORT_RESERVED || port == NFS_PORT)
+ goto bad;
+#endif
+
+ if (ntohs (sin->sin_port) < IPPORT_RESERVED)
+ return (1);
+ if (sin->sin_addr.s_addr == htonl (INADDR_BROADCAST))
+ return (1);
+ /* XXX compare against broadcast addresses in SIOCGIFCONF list? */
+ return (0);
+
+#ifdef OpenBSD
+bad:
+ return (1);
+#endif
+}
+
+#ifdef OpenBSD
+void
+reap(int sig)
+{
+ wantreap = 1;
+}
+#endif
+
+void
+reapchild(int sig)
+{
+ pid_t pid;
+ int save_errno = errno, status;
+ register struct servtab *sep;
+
+#ifdef OpenBSD
+ if (debug)
+ fprintf(stderr, "reaping asked for\n");
+#endif
+
+ for (;;) {
+ pid = wait3(&status, WNOHANG, NULL);
+ if (pid <= 0)
+ break;
+ if (debug)
+ fprintf(stderr, "%d reaped, status %x\n", pid, status);
+ for (sep = servtab; sep; sep = sep->se_next)
+ if (sep->se_wait == pid) {
+ if (WIFEXITED(status) && WEXITSTATUS(status))
+ syslog(LOG_WARNING,
+ "%s: exit status 0x%x",
+ sep->se_server, WEXITSTATUS(status));
+ else if (WIFSIGNALED(status))
+ syslog(LOG_WARNING,
+ "%s: exit signal 0x%x",
+ sep->se_server, WTERMSIG(status));
+ sep->se_wait = 1;
+ /* fd_grow(&allsockp, &allsockn, sep->se_fd); */
+ FD_SET(sep->se_fd, &allsock);
+ nsock++;
+ if (debug)
+ fprintf(stderr, "restored %s, fd %d\n",
+ sep->se_service, sep->se_fd);
+ }
+ }
+ errno = save_errno;
+}
+
+int setconfig __P((void));
+void endconfig __P((void));
+
+void register_rpc __P((struct servtab *));
+void unregister_rpc __P((struct servtab *));
+void freeconfig __P((struct servtab *));
+void print_service __P((char *, struct servtab *));
+void setup __P((struct servtab *));
+struct servtab *getconfigent __P((void));
+struct servtab *enter __P((struct servtab *));
+int matchconf __P((struct servtab *, struct servtab *));
+
+#ifdef OpenBSD
+void
+config(int sig)
+{
+ wantconfig = 1;
+}
+#endif
+
+void
+config(int sig)
+{
+ register struct servtab *sep, *cp, **sepp;
+ int omask;
+ int n, add;
+ char protoname[10];
+
+ if (!setconfig()) {
+ syslog(LOG_ERR, "%s: %m", CONFIG);
+ return;
+ }
+ for (sep = servtab; sep; sep = sep->se_next)
+ sep->se_checked = 0;
+ cp = getconfigent();
+ while (cp != NULL) {
+ for (sep = servtab; sep; sep = sep->se_next)
+ if (matchconf(sep, cp))
+ break;
+ add = 0;
+ if (sep != 0) {
+ int i;
+
+#define SWAP(type, a, b) {type c=(type)a; a=(type)b; b=(type)c;}
+
+ omask = sigblock(SIGBLOCK);
+ /*
+ * sep->se_wait may be holding the pid of a daemon
+ * that we're waiting for. If so, don't overwrite
+ * it unless the config file explicitly says don't
+ * wait.
+ */
+ if (cp->se_bi == 0 &&
+ (sep->se_wait == 1 || cp->se_wait == 0))
+ sep->se_wait = cp->se_wait;
+ SWAP(int, cp->se_max, sep->se_max);
+ SWAP(char *, sep->se_user, cp->se_user);
+ SWAP(char *, sep->se_group, cp->se_group);
+ SWAP(char *, sep->se_server, cp->se_server);
+ for (i = 0; i < MAXARGV; i++)
+ SWAP(char *, sep->se_argv[i], cp->se_argv[i]);
+#undef SWAP
+ if (isrpcservice(sep))
+ unregister_rpc(sep);
+ sep->se_rpcversl = cp->se_rpcversl;
+ sep->se_rpcversh = cp->se_rpcversh;
+ sigsetmask(omask);
+ freeconfig(cp);
+ add = 1;
+ } else {
+ sep = enter(cp);
+ }
+ sep->se_checked = 1;
+
+ switch (sep->se_family) {
+ case AF_UNIX:
+ if (sep->se_fd != -1)
+ break;
+ (void)unlink(sep->se_service);
+ n = strlen(sep->se_service);
+ if (n > sizeof sep->se_ctrladdr_un.sun_path - 1)
+ n = sizeof sep->se_ctrladdr_un.sun_path - 1;
+ strncpy(sep->se_ctrladdr_un.sun_path,
+ sep->se_service, n);
+ sep->se_ctrladdr_un.sun_path[n] = '\0';
+ sep->se_ctrladdr_un.sun_family = AF_UNIX;
+ sep->se_ctrladdr_size = n +
+ sizeof sep->se_ctrladdr_un.sun_family;
+ setup(sep);
+ break;
+ case AF_INET:
+ sep->se_ctrladdr_in.sin_family = AF_INET;
+ /* se_ctrladdr_in was set in getconfigent */
+ sep->se_ctrladdr_size = sizeof sep->se_ctrladdr_in;
+
+ if (isrpcservice(sep)) {
+ struct rpcent *rp;
+
+ sep->se_rpcprog = atoi(sep->se_service);
+ if (sep->se_rpcprog == 0) {
+ rp = getrpcbyname(sep->se_service);
+ if (rp == 0) {
+ syslog(LOG_ERR,
+ "%s: unknown rpc service",
+ sep->se_service);
+ goto serv_unknown;
+ }
+ sep->se_rpcprog = rp->r_number;
+ }
+ if (sep->se_fd == -1)
+ setup(sep);
+ if (sep->se_fd != -1)
+ register_rpc(sep);
+ } else {
+ u_short port = htons(atoi(sep->se_service));
+
+ if (!port) {
+ /*XXX*/
+ strncpy(protoname, sep->se_proto,
+ sizeof(protoname));
+ if (isdigit(protoname[strlen(protoname) - 1]))
+ protoname[strlen(protoname) - 1] = '\0';
+ sp = getservbyname(sep->se_service,
+ protoname);
+ if (sp == 0) {
+ syslog(LOG_ERR,
+ "%s/%s: unknown service",
+ sep->se_service, sep->se_proto);
+ goto serv_unknown;
+ }
+ port = sp->s_port;
+ }
+ if (port != sep->se_ctrladdr_in.sin_port) {
+ sep->se_ctrladdr_in.sin_port = port;
+ if (sep->se_fd != -1) {
+ FD_CLR(sep->se_fd, &allsock);
+ nsock--;
+ (void) close(sep->se_fd);
+ }
+ sep->se_fd = -1;
+ }
+ if (sep->se_fd == -1)
+ setup(sep);
+ }
+ break;
+ case AF_INET6:
+ sep->se_ctrladdr_in6.sin6_family = AF_INET6;
+ /* se_ctrladdr_in was set in getconfigent */
+ sep->se_ctrladdr_size = sizeof sep->se_ctrladdr_in6;
+
+ if (isrpcservice(sep)) {
+ struct rpcent *rp;
+
+ sep->se_rpcprog = atoi(sep->se_service);
+ if (sep->se_rpcprog == 0) {
+ rp = getrpcbyname(sep->se_service);
+ if (rp == 0) {
+ syslog(LOG_ERR,
+ "%s: unknown rpc service",
+ sep->se_service);
+ goto serv_unknown;
+ }
+ sep->se_rpcprog = rp->r_number;
+ }
+ if (sep->se_fd == -1)
+ setup(sep);
+ if (sep->se_fd != -1)
+ register_rpc(sep);
+ } else {
+ u_short port = htons(atoi(sep->se_service));
+
+ if (!port) {
+ /*XXX*/
+ strncpy(protoname, sep->se_proto,
+ sizeof(protoname));
+ if (isdigit(protoname[strlen(protoname) - 1]))
+ protoname[strlen(protoname) - 1] = '\0';
+ sp = getservbyname(sep->se_service,
+ protoname);
+ if (sp == 0) {
+ syslog(LOG_ERR,
+ "%s/%s: unknown service",
+ sep->se_service, sep->se_proto);
+ goto serv_unknown;
+ }
+ port = sp->s_port;
+ }
+ if (port != sep->se_ctrladdr_in6.sin6_port) {
+ sep->se_ctrladdr_in6.sin6_port = port;
+ if (sep->se_fd != -1) {
+ FD_CLR(sep->se_fd, &allsock);
+ nsock--;
+ (void) close(sep->se_fd);
+ }
+ sep->se_fd = -1;
+ }
+ if (sep->se_fd == -1)
+ setup(sep);
+ }
+ break;
+ }
+ serv_unknown:
+ if (cp->se_next != NULL) {
+ struct servtab *tmp = cp;
+
+ cp = cp->se_next;
+ free(tmp);
+ } else {
+ free(cp);
+ cp = getconfigent();
+ }
+ if (debug)
+ print_service(add ? "REDO" : "ADD", sep);
+ }
+ endconfig();
+ /*
+ * Purge anything not looked at above.
+ */
+ omask = sigblock(SIGBLOCK);
+ sepp = &servtab;
+ while ((sep = *sepp)) {
+ if (sep->se_checked) {
+ sepp = &sep->se_next;
+ continue;
+ }
+ *sepp = sep->se_next;
+ if (sep->se_fd != -1) {
+ FD_CLR(sep->se_fd, &allsock);
+ nsock--;
+ (void) close(sep->se_fd);
+ }
+ if (isrpcservice(sep))
+ unregister_rpc(sep);
+ if (sep->se_family == AF_UNIX)
+ (void)unlink(sep->se_service);
+ if (debug)
+ print_service("FREE", sep);
+ freeconfig(sep);
+ free((char *)sep);
+ }
+ (void) sigsetmask(omask);
+}
+
+#ifdef OpenBSD
+void
+retry(int sig)
+{
+ wantretry = 1;
+}
+#endif
+
+void
+retry(int sig)
+{
+ register struct servtab *sep;
+
+ timingout = 0;
+ for (sep = servtab; sep; sep = sep->se_next) {
+ if (sep->se_fd == -1) {
+ switch (sep->se_family) {
+ case AF_UNIX:
+ case AF_INET:
+ case AF_INET6:
+ setup(sep);
+ if (sep->se_fd != -1 && isrpcservice(sep))
+ register_rpc(sep);
+ break;
+ }
+ }
+ }
+}
+
+void
+goaway(sig)
+ int sig;
+{
+ register struct servtab *sep;
+
+ /* XXX signal race walking sep list */
+ for (sep = servtab; sep; sep = sep->se_next) {
+ if (sep->se_fd == -1)
+ continue;
+
+ switch (sep->se_family) {
+ case AF_UNIX:
+ (void)unlink(sep->se_service);
+ break;
+ case AF_INET:
+ case AF_INET6:
+ if (sep->se_wait == 1 && isrpcservice(sep))
+ unregister_rpc(sep); /* XXX signal race */
+ break;
+ }
+ (void)close(sep->se_fd);
+ }
+ (void)unlink(_PATH_INETDPID);
+ exit(0);
+}
+
+int bump_nofile __P((void));
+
+void
+setup(sep)
+ register struct servtab *sep;
+{
+ int on = 1;
+ int r;
+
+ if ((sep->se_fd = socket(sep->se_family, sep->se_socktype, 0)) < 0) {
+ syslog(LOG_ERR, "%s/%s: socket: %m",
+ sep->se_service, sep->se_proto);
+ return;
+ }
+#define turnon(fd, opt) \
+setsockopt(fd, SOL_SOCKET, opt, (char *)&on, sizeof (on))
+ if (strncmp(sep->se_proto, "tcp", 3) == 0 && (options & SO_DEBUG) &&
+ turnon(sep->se_fd, SO_DEBUG) < 0)
+ syslog(LOG_ERR, "setsockopt (SO_DEBUG): %m");
+ if (turnon(sep->se_fd, SO_REUSEADDR) < 0)
+ syslog(LOG_ERR, "setsockopt (SO_REUSEADDR): %m");
+#undef turnon
+ if (isrpcservice(sep)) {
+ struct passwd *pwd;
+
+ /*
+ * for RPC services, attempt to use a reserved port
+ * if they are going to be running as root.
+ *
+ * Also, zero out the port for all RPC services; let bind()
+ * find one.
+ */
+ sep->se_ctrladdr_in.sin_port = 0;
+ if (sep->se_user && (pwd = getpwnam(sep->se_user)) &&
+ pwd->pw_uid == 0 && uid == 0)
+ r = bindresvport(sep->se_fd, &sep->se_ctrladdr_in);
+ else {
+ r = bind(sep->se_fd, &sep->se_ctrladdr,
+ sep->se_ctrladdr_size);
+ if (r == 0) {
+ int len = sep->se_ctrladdr_size;
+ int saveerrno = errno;
+
+ /* update se_ctrladdr_in.sin_port */
+ r = getsockname(sep->se_fd, &sep->se_ctrladdr,
+ &len);
+ if (r <= 0)
+ errno = saveerrno;
+ }
+ }
+ } else
+ r = bind(sep->se_fd, &sep->se_ctrladdr, sep->se_ctrladdr_size);
+ if (r < 0) {
+ syslog(LOG_ERR, "%s/%s (%d): bind: %m",
+ sep->se_service, sep->se_proto, sep->se_ctrladdr.sa_family);
+ close(sep->se_fd);
+ sep->se_fd = -1;
+ if (!timingout) {
+ timingout = 1;
+ alarm(RETRYTIME);
+ }
+ return;
+ }
+ if (sep->se_socktype == SOCK_STREAM)
+ listen(sep->se_fd, global_queuelen);
+
+ /* fd_grow(&allsockp, &allsockn, sep->se_fd); */
+ FD_SET(sep->se_fd, &allsock);
+ nsock++;
+ if (sep->se_fd > maxsock) {
+ maxsock = sep->se_fd;
+ if (maxsock > rlim_ofile_cur - FD_MARGIN)
+ bump_nofile();
+ }
+}
+
+void
+register_rpc(sep)
+ register struct servtab *sep;
+{
+ int n;
+ struct sockaddr_in sin;
+ struct protoent *pp;
+
+ if ((pp = getprotobyname(sep->se_proto+4)) == NULL) {
+ syslog(LOG_ERR, "%s: getproto: %m",
+ sep->se_proto);
+ return;
+ }
+ n = sizeof sin;
+ if (getsockname(sep->se_fd, (struct sockaddr *)&sin, &n) < 0) {
+ syslog(LOG_ERR, "%s/%s: getsockname: %m",
+ sep->se_service, sep->se_proto);
+ return;
+ }
+
+ for (n = sep->se_rpcversl; n <= sep->se_rpcversh; n++) {
+ if (debug)
+ fprintf(stderr, "pmap_set: %u %u %u %u\n",
+ sep->se_rpcprog, n, pp->p_proto,
+ ntohs(sin.sin_port));
+ (void)pmap_unset(sep->se_rpcprog, n);
+ if (!pmap_set(sep->se_rpcprog, n, pp->p_proto, ntohs(sin.sin_port)))
+ syslog(LOG_ERR, "%s %s: pmap_set: %u %u %u %u: %m",
+ sep->se_service, sep->se_proto,
+ sep->se_rpcprog, n, pp->p_proto,
+ ntohs(sin.sin_port));
+ }
+}
+
+void
+unregister_rpc(sep)
+ register struct servtab *sep;
+{
+ int n;
+
+ for (n = sep->se_rpcversl; n <= sep->se_rpcversh; n++) {
+ if (debug)
+ fprintf(stderr, "pmap_unset(%u, %u)\n",
+ sep->se_rpcprog, n);
+ if (!pmap_unset(sep->se_rpcprog, n))
+ syslog(LOG_ERR, "pmap_unset(%u, %u)",
+ sep->se_rpcprog, n);
+ }
+}
+
+
+struct servtab *
+enter(cp)
+ struct servtab *cp;
+{
+ register struct servtab *sep;
+ int omask;
+
+ sep = (struct servtab *)malloc(sizeof (*sep));
+ if (sep == NULL) {
+ syslog(LOG_ERR, "Out of memory.");
+ exit(1);
+ }
+ *sep = *cp;
+ sep->se_fd = -1;
+ sep->se_rpcprog = -1;
+ omask = sigblock(SIGBLOCK);
+ sep->se_next = servtab;
+ servtab = sep;
+ sigsetmask(omask);
+ return (sep);
+}
+
+int
+matchconf (old, new)
+ struct servtab *old;
+ struct servtab *new;
+{
+ if (strcmp(old->se_service, new->se_service) != 0)
+ return (0);
+
+ if (strcmp(old->se_hostaddr, new->se_hostaddr) != 0)
+ return (0);
+
+ if (strcmp(old->se_proto, new->se_proto) != 0)
+ return (0);
+
+ /*
+ * If the new servtab is bound to a specific address, check that the
+ * old servtab is bound to the same entry. If the new service is not
+ * bound to a specific address then the check of se_hostaddr above
+ * is sufficient.
+ */
+
+ if (old->se_family == AF_INET && new->se_family == AF_INET &&
+ bcmp(&old->se_ctrladdr_in.sin_addr,
+ &new->se_ctrladdr_in.sin_addr,
+ sizeof(new->se_ctrladdr_in.sin_addr)) != 0)
+ return (0);
+
+ if (old->se_family == AF_INET6 && new->se_family == AF_INET6 &&
+ bcmp(&old->se_ctrladdr_in6.sin6_addr,
+ &new->se_ctrladdr_in6.sin6_addr,
+ sizeof(new->se_ctrladdr_in6.sin6_addr)) != 0)
+ return (0);
+#ifdef OpenBSD
+ if (old->se_family == AF_INET6 && new->se_family == AF_INET6 &&
+ old->se_ctrladdr_in6.sin6_scope_id !=
+ new->se_ctrladdr_in6.sin6_scope_id)
+ return (0);
+#endif
+
+ return (1);
+}
+
+FILE *fconfig = NULL;
+char line[1024];
+char *defhost;
+char *skip __P((char **));
+char *nextline __P((FILE *));
+char *newstr __P((char *));
+struct servtab *dupconfig __P((struct servtab *));
+
+int
+setconfig()
+{
+ if (defhost) free(defhost);
+ defhost = newstr("*");
+ if (fconfig != NULL) {
+ fseek(fconfig, 0L, SEEK_SET);
+ return (1);
+ }
+ fconfig = fopen(CONFIG, "r");
+ return (fconfig != NULL);
+}
+
+void
+endconfig()
+{
+ if (fconfig) {
+ (void) fclose(fconfig);
+ fconfig = NULL;
+ }
+ if (defhost) {
+ free(defhost);
+ defhost = 0;
+ }
+}
+
+struct servtab *
+getconfigent()
+{
+ register struct servtab *sep;
+ int argc;
+ char *cp, *arg;
+ char *hostdelim;
+ struct servtab *nsep;
+ struct servtab *psep;
+
+ sep = (struct servtab *) malloc(sizeof(struct servtab));
+ if (sep == NULL) {
+ syslog(LOG_ERR, "malloc: %m");
+ exit(1);
+ }
+
+ /* memset(sep, 0, sizeof *sep); */
+more:
+ /* freeconfig(sep); */
+
+ while ((cp = nextline(fconfig)) && *cp == '#')
+ ;
+ if (cp == NULL) {
+ /* free(sep); */
+ return (NULL);
+ }
+
+ memset((char *)sep, 0, sizeof *sep);
+ arg = skip(&cp);
+ if (arg == NULL) {
+ /* A blank line. */
+ goto more;
+ }
+
+ /* Check for a host name. */
+ hostdelim = strrchr(arg, ':');
+ if (hostdelim) {
+ *hostdelim = '\0';
+#ifdef OpenBSD
+ if (arg[0] == '[' && hostdelim > arg && hostdelim[-1] == ']') {
+ hostdelim[-1] = '\0';
+ sep->se_hostaddr = newstr(arg + 1);
+ } else
+#endif
+ sep->se_hostaddr = newstr(arg);
+ arg = hostdelim + 1;
+ /*
+ * If the line is of the form `host:', then just change the
+ * default host for the following lines.
+ */
+ if (*arg == '\0') {
+ arg = skip(&cp);
+ if (cp == NULL) {
+ free(defhost);
+ defhost = sep->se_hostaddr;
+ goto more;
+ }
+ }
+ } else
+ sep->se_hostaddr = newstr(defhost);
+
+ sep->se_service = newstr(arg);
+#ifdef OpenBSD
+ if ((arg = skip(&cp, 1)) == NULL)
+ goto more;
+#endif
+ arg = skip (&cp);
+
+ if (strcmp(arg, "stream") == 0)
+ sep->se_socktype = SOCK_STREAM;
+ else if (strcmp(arg, "dgram") == 0)
+ sep->se_socktype = SOCK_DGRAM;
+ else if (strcmp(arg, "rdm") == 0)
+ sep->se_socktype = SOCK_RDM;
+ else if (strcmp(arg, "seqpacket") == 0)
+ sep->se_socktype = SOCK_SEQPACKET;
+ else if (strcmp(arg, "raw") == 0)
+ sep->se_socktype = SOCK_RAW;
+ else
+ sep->se_socktype = -1;
+
+#ifdef OpenBSD
+ if ((arg = skip(&cp, 1)) == NULL)
+ goto more;
+#endif
+
+ sep->se_proto = newstr(skip (&cp));
+
+ if (strcmp(sep->se_proto, "unix") == 0) {
+ sep->se_family = AF_UNIX;
+ } else {
+ sep->se_family = AF_INET;
+ if (sep->se_proto[strlen(sep->se_proto) - 1] == '6')
+ sep->se_family = AF_INET6;
+ if (strncmp(sep->se_proto, "rpc/", 4) == 0) {
+ char *cp, *ccp;
+ long l;
+
+ cp = strchr(sep->se_service, '/');
+ if (cp == 0) {
+ syslog(LOG_ERR, "%s: no rpc version",
+ sep->se_service);
+ goto more;
+ }
+ *cp++ = '\0';
+ l = strtol(cp, &ccp, 0);
+ if (ccp == cp || l < 0 || l > INT_MAX) {
+ badafterall:
+ syslog(LOG_ERR, "%s/%s: bad rpc version",
+ sep->se_service, cp);
+ goto more;
+ }
+ sep->se_rpcversl = sep->se_rpcversh = l;
+ if (*ccp == '-') {
+ cp = ccp + 1;
+ l = strtol(cp, &ccp, 0);
+ if (ccp == cp || l < 0 || l > INT_MAX ||
+ l < sep->se_rpcversl || *ccp)
+ goto badafterall;
+ sep->se_rpcversh = l;
+ } else if (*ccp != '\0')
+ goto badafterall;
+ }
+ }
+ arg = skip(&cp);
+ if (arg == NULL)
+ goto more;
+
+#ifdef OpenBSD
+ s = strchr(arg, '.');
+ if (s) {
+ char *p;
+
+ *s++ = '\0';
+ sep->se_max = strtoul(s, &p, 0);
+ if (sep->se_max < 1 || *p) {
+ syslog(LOG_ERR, "%s: illegal max field \"%s\", setting to %d",
+ sep->se_service, s, toomany);
+ sep->se_max = toomany;
+ }
+ } else
+ sep->se_max = toomany;
+#endif
+
+ {
+ char *s = strchr (arg, '.');
+ if (s) {
+ *s++ = '\0';
+ sep->se_max = atoi (s);
+ } else
+ sep->se_max = toomany;
+ }
+ sep->se_wait = strcmp(arg, "wait") == 0;
+ /* if ((arg = skip(&cp, 1)) == NULL) */
+ /* goto more; */
+ sep->se_user = newstr(skip (&cp));
+ arg = strchr(sep->se_user, '.');
+ if (arg == NULL)
+ arg = strchr(sep->se_user, ':');
+ if (arg) {
+ *arg++ = '\0';
+ sep->se_group = newstr(arg);
+ }
+ /* if ((arg = skip(&cp, 1)) == NULL) */
+ /* goto more; */
+
+ sep->se_server = newstr(skip (&cp));
+ if (strcmp(sep->se_server, "internal") == 0) {
+ register struct biltin *bi;
+
+ for (bi = biltins; bi->bi_service; bi++)
+ if (bi->bi_socktype == sep->se_socktype &&
+ strcmp(bi->bi_service, sep->se_service) == 0)
+ break;
+ if (bi->bi_service == 0) {
+ syslog(LOG_ERR, "internal service %s unknown",
+ sep->se_service);
+ goto more;
+ }
+ sep->se_bi = bi;
+ sep->se_wait = bi->bi_wait;
+ } else
+ sep->se_bi = NULL;
+ argc = 0;
+ for (arg = skip(&cp); cp; arg = skip(&cp)) {
+ if (argc < MAXARGV)
+ sep->se_argv[argc++] = newstr(arg);
+ }
+ while (argc <= MAXARGV)
+ sep->se_argv[argc++] = NULL;
+
+ /*
+ * Now that we've processed the entire line, check if the hostname
+ * specifier was a comma separated list of hostnames. If so
+ * we'll make new entries for each address.
+ */
+ while ((hostdelim = strrchr(sep->se_hostaddr, ',')) != NULL) {
+ nsep = dupconfig(sep);
+
+ /*
+ * NULL terminate the hostname field of the existing entry,
+ * and make a dup for the new entry.
+ */
+ *hostdelim++ = '\0';
+ nsep->se_hostaddr = newstr(hostdelim);
+
+ nsep->se_next = sep->se_next;
+ sep->se_next = nsep;
+ }
+
+ nsep = sep;
+ while (nsep != NULL) {
+ nsep->se_checked = 1;
+ /* switch (nsep->se_family) { */
+ if (nsep->se_family == AF_INET) {
+#ifdef OpenBSD
+ case AF_INET:
+ case AF_INET6:
+ {
+ struct addrinfo hints, *res0, *res;
+ char *host, *port;
+ int error;
+ int s;
+
+ /* check if the family is supported */
+ s = socket(nsep->se_family, SOCK_DGRAM, 0);
+ if (s < 0) {
+ syslog(LOG_WARNING,
+"%s/%s: %s: the address family is not supported by the kernel",
+ nsep->se_service, nsep->se_proto,
+ nsep->se_hostaddr);
+ nsep->se_checked = 0;
+ goto skip;
+ }
+ close(s);
+#endif
+ if (!strcmp (nsep->se_hostaddr, "*"))
+ nsep->se_ctrladdr_in.sin_addr.s_addr = INADDR_ANY;
+ else if (!inet_aton (nsep->se_hostaddr, &nsep->se_ctrladdr_in.sin_addr)) {
+ struct hostent *hp;
+
+#ifdef OpenBSD
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = nsep->se_family;
+ hints.ai_socktype = nsep->se_socktype;
+ hints.ai_flags = AI_PASSIVE;
+ if (!strcmp(nsep->se_hostaddr, "*"))
+ host = NULL;
+ else
+ host = nsep->se_hostaddr;
+ port = "0";
+ /* XXX shortened IPv4 syntax is now forbidden */
+ error = getaddrinfo(host, port, &hints, &res0);
+ if (error) {
+ syslog(LOG_ERR, "%s/%s: %s: %s",
+ nsep->se_service, nsep->se_proto,
+ nsep->se_hostaddr,
+ gai_strerror(error));
+ nsep->se_checked = 0;
+ goto skip;
+ }
+ for (res = res0; res; res = res->ai_next) {
+ if (res->ai_addrlen >
+ sizeof(nsep->se_ctrladdr_storage))
+ continue;
+ if (res == res0) {
+ memcpy(&nsep->se_ctrladdr_storage,
+ res->ai_addr, res->ai_addrlen);
+ continue;
+ }
+#endif
+ hp = gethostbyname (nsep->se_hostaddr);
+ if (hp == 0) {
+ syslog (LOG_ERR, "%s: unknown host", nsep->se_hostaddr);
+ nsep->se_checked = 0;
+ goto skip;
+ } else if (hp->h_addrtype != AF_INET) {
+ syslog (LOG_ERR,
+ "%s: address isn't an Internet "
+ "address", nsep->se_hostaddr);
+ nsep->se_checked = 0;
+ goto skip;
+ } else {
+ int i = 1;
+
+#ifdef OpenBSD
+ psep = dupconfig(nsep);
+ psep->se_hostaddr = newstr(nsep->se_hostaddr);
+ psep->se_checked = 1;
+ memcpy(&psep->se_ctrladdr_storage, res->ai_addr,
+ res->ai_addrlen);
+ psep->se_ctrladdr_size = res->ai_addrlen;
+
+ /*
+ * Prepend to list, don't want to look up its
+ * hostname again.
+ */
+ psep->se_next = sep;
+ sep = psep;
+ }
+ freeaddrinfo(res0);
+ break;
+ }
+#endif
+ memmove (&nsep->se_ctrladdr_in.sin_addr,
+ hp->h_addr_list[0], sizeof (struct in_addr));
+ while (hp->h_addr_list[i] != NULL) {
+ psep = dupconfig (nsep);
+ psep->se_hostaddr = newstr (nsep->se_hostaddr);
+ psep->se_checked = 1;
+ memmove (&psep->se_ctrladdr_in.sin_addr,
+ hp->h_addr_list[i], sizeof (struct in_addr));
+ psep->se_ctrladdr_size = sizeof (psep->se_ctrladdr_in);
+ i++;
+ /* Prepend to list, don't want to look up its */
+ /* hostname again. */
+ psep->se_next = sep;
+ sep = psep;
+ }
+ }
+ }
+ }
+/* XXX BUG?: is this skip: label supposed to remain? */
+skip:
+ nsep = nsep->se_next;
+ }
+
+ /*
+ * Finally, free any entries which failed the gethostbyname
+ * check.
+ */
+ psep = NULL;
+ nsep = sep;
+ while (nsep != NULL) {
+ struct servtab *tsep;
+
+ if (nsep->se_checked == 0) {
+ tsep = nsep;
+ if (psep == NULL) {
+ sep = nsep->se_next;
+ nsep = sep;
+ } else {
+ nsep = nsep->se_next;
+ psep->se_next = nsep;
+ }
+ freeconfig(tsep);
+ } else {
+ nsep->se_checked = 0;
+ psep = nsep;
+ nsep = nsep->se_next;
+ }
+ }
+
+ return (sep);
+}
+
+void
+freeconfig(cp)
+ register struct servtab *cp;
+{
+ int i;
+
+ if (cp->se_hostaddr)
+ free(cp->se_hostaddr);
+ if (cp->se_service)
+ free(cp->se_service);
+ if (cp->se_proto)
+ free(cp->se_proto);
+ if (cp->se_user)
+ free(cp->se_user);
+ if (cp->se_group)
+ free(cp->se_group);
+ if (cp->se_server)
+ free(cp->se_server);
+ for (i = 0; i < MAXARGV; i++)
+ if (cp->se_argv[i])
+ free(cp->se_argv[i]);
+}
+
+char *
+skip(cpp)
+ char **cpp;
+ /* int report; */
+{
+ register char *cp = *cpp;
+ char *start;
+
+/* erp: */
+ if (*cpp == NULL) {
+ /* if (report) */
+ /* syslog(LOG_ERR, "syntax error in inetd config file"); */
+ return (NULL);
+ }
+
+again:
+ while (*cp == ' ' || *cp == '\t')
+ cp++;
+ if (*cp == '\0') {
+ int c;
+
+ c = getc(fconfig);
+ (void) ungetc(c, fconfig);
+ if (c == ' ' || c == '\t')
+ if ((cp = nextline(fconfig)))
+ goto again;
+ *cpp = NULL;
+ /* goto erp; */
+ return (NULL);
+ }
+ start = cp;
+ while (*cp && *cp != ' ' && *cp != '\t')
+ cp++;
+ if (*cp != '\0')
+ *cp++ = '\0';
+ /* if ((*cpp = cp) == NULL) */
+ /* goto erp; */
+
+ *cpp = cp;
+ return (start);
+}
+
+char *
+nextline(fd)
+ FILE *fd;
+{
+ char *cp;
+
+ if (fgets(line, sizeof (line), fd) == NULL)
+ return (NULL);
+ cp = strchr(line, '\n');
+ if (cp)
+ *cp = '\0';
+ return (line);
+}
+
+char *
+newstr(cp)
+ char *cp;
+{
+ if ((cp = strdup(cp ? cp : "")))
+ return(cp);
+ syslog(LOG_ERR, "strdup: %m");
+ exit(1);
+}
+
+struct servtab *
+dupconfig(sep)
+ struct servtab *sep;
+{
+ struct servtab *newtab;
+ int argc;
+
+ newtab = (struct servtab *) malloc(sizeof(struct servtab));
+
+ if (newtab == NULL) {
+ syslog(LOG_ERR, "malloc: %m");
+ exit(1);
+ }
+
+ memset((char *)newtab, 0, sizeof(struct servtab));
+
+ newtab->se_service = sep->se_service ? newstr(sep->se_service) : NULL;
+ newtab->se_socktype = sep->se_socktype;
+ newtab->se_family = sep->se_family;
+ newtab->se_proto = sep->se_proto ? newstr(sep->se_proto) : NULL;
+ newtab->se_rpcprog = sep->se_rpcprog;
+ newtab->se_rpcversl = sep->se_rpcversl;
+ newtab->se_rpcversh = sep->se_rpcversh;
+ newtab->se_wait = sep->se_wait;
+ newtab->se_user = sep->se_user ? newstr(sep->se_user) : NULL;
+ newtab->se_group = sep->se_group ? newstr(sep->se_group) : NULL;
+ newtab->se_bi = sep->se_bi;
+ newtab->se_server = sep->se_server ? newstr(sep->se_server) : 0;
+
+ for (argc = 0; argc <= MAXARGV; argc++)
+ newtab->se_argv[argc] = sep->se_argv[argc] ?
+ newstr(sep->se_argv[argc]) : NULL;
+ newtab->se_max = sep->se_max;
+
+ return (newtab);
+}
+
+void
+inetd_setproctitle(a, s)
+ char *a;
+ int s;
+{
+ int size;
+ register char *cp;
+ struct sockaddr_in sin;
+ char buf[80];
+
+ cp = Argv[0];
+ size = sizeof(sin);
+ (void) snprintf(buf, sizeof buf, "-%s", a);
+ if (getpeername(s, (struct sockaddr *)&sin, &size) == 0) {
+ char *s = inet_ntoa(sin.sin_addr);
+
+ buf[sizeof(buf) - 1 - strlen(s) - 3] = '\0';
+ strcat(buf, " [");
+ strcat(buf, s);
+ strcat(buf, "]");
+ }
+ strncpy(cp, buf, LastArg - cp);
+ cp += strlen(cp);
+ while (cp < LastArg)
+ *cp++ = ' ';
+}
+
+void
+logpid()
+{
+ FILE *fp;
+
+ if ((fp = fopen(_PATH_INETDPID, "w")) != NULL) {
+ fprintf(fp, "%u\n", getpid());
+ (void)fclose(fp);
+ }
+}
+
+int
+bump_nofile()
+{
+#ifdef RLIMIT_NOFILE
+
+#define FD_CHUNK 32
+
+ struct rlimit rl;
+
+ if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
+ syslog(LOG_ERR, "getrlimit: %m");
+ return -1;
+ }
+ rl.rlim_cur = MIN(rl.rlim_max, rl.rlim_cur + FD_CHUNK);
+ rl.rlim_cur = MIN(FD_SETSIZE, rl.rlim_cur + FD_CHUNK);
+ if (rl.rlim_cur <= rlim_ofile_cur) {
+ syslog(LOG_ERR,
+ "bump_nofile: cannot extend file limit, max = %d",
+ (int)rl.rlim_cur);
+ return -1;
+ }
+
+ if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
+ syslog(LOG_ERR, "setrlimit: %m");
+ return -1;
+ }
+
+ rlim_ofile_cur = rl.rlim_cur;
+ return 0;
+
+#else
+ syslog(LOG_ERR, "bump_nofile: cannot extend file limit");
+ return -1;
+#endif
+}
+
+/*
+ * Internet services provided internally by inetd:
+ */
+#define BUFSIZE 4096
+
+/* ARGSUSED */
+void
+echo_stream(s, sep) /* Echo service -- echo data back */
+ int s;
+ struct servtab *sep;
+{
+ char buffer[BUFSIZE];
+ int i;
+
+ inetd_setproctitle(sep->se_service, s);
+ while ((i = read(s, buffer, sizeof(buffer))) > 0 &&
+ write(s, buffer, i) > 0)
+ ;
+ exit(0);
+}
+
+/* ARGSUSED */
+void
+echo_dg(s, sep) /* Echo service -- echo data back */
+ int s;
+ struct servtab *sep;
+{
+ char buffer[BUFSIZE];
+ int i, size;
+ /* struct sockaddr_storage ss; */
+ struct sockaddr sa;
+
+ size = sizeof(sa);
+ if ((i = recvfrom(s, buffer, sizeof(buffer), 0, &sa,
+ &size)) < 0)
+ return;
+ if (dg_badinput((struct sockaddr_in *)&sa))
+ return;
+ (void) sendto(s, buffer, i, 0, &sa, sizeof(sa));
+}
+
+/* ARGSUSED */
+void
+discard_stream(s, sep) /* Discard service -- ignore data */
+ int s;
+ struct servtab *sep;
+{
+ char buffer[BUFSIZE];
+
+ inetd_setproctitle(sep->se_service, s);
+ while ((errno = 0, read(s, buffer, sizeof(buffer)) > 0) ||
+ errno == EINTR)
+ ;
+ exit(0);
+}
+
+/* ARGSUSED */
+void
+discard_dg(s, sep) /* Discard service -- ignore data */
+ int s;
+ struct servtab *sep;
+{
+ char buffer[BUFSIZE];
+
+ (void) read(s, buffer, sizeof(buffer));
+}
+
+#include <ctype.h>
+#define LINESIZ 72
+char ring[128];
+char *endring;
+
+void
+initring()
+{
+ register int i;
+
+ endring = ring;
+
+ for (i = 0; i <= 128; ++i)
+ if (isprint(i))
+ *endring++ = i;
+}
+
+/* ARGSUSED */
+void
+chargen_stream(s, sep) /* Character generator */
+ int s;
+ struct servtab *sep;
+{
+ register char *rs;
+ int len;
+ char text[LINESIZ+2];
+
+ inetd_setproctitle(sep->se_service, s);
+
+ if (!endring) {
+ initring();
+ rs = ring;
+ }
+
+ text[LINESIZ] = '\r';
+ text[LINESIZ + 1] = '\n';
+ for (rs = ring;;) {
+ if ((len = endring - rs) >= LINESIZ)
+ memmove(text, rs, LINESIZ);
+ else {
+ memmove(text, rs, len);
+ memmove(text + len, ring, LINESIZ - len);
+ }
+ if (++rs == endring)
+ rs = ring;
+ if (write(s, text, sizeof(text)) != sizeof(text))
+ break;
+ }
+ exit(0);
+}
+
+/* ARGSUSED */
+void
+chargen_dg(s, sep) /* Character generator */
+ int s;
+ struct servtab *sep;
+{
+ /* struct sockaddr_storage ss; */
+ struct sockaddr sa;
+ static char *rs;
+ int len, size;
+ char text[LINESIZ+2];
+
+ if (endring == 0) {
+ initring();
+ rs = ring;
+ }
+
+ size = sizeof(sa);
+ if (recvfrom(s, text, sizeof(text), 0, &sa,
+ &size) < 0)
+ return;
+ if (dg_badinput((struct sockaddr_in *)&sa))
+ return;
+
+ if ((len = endring - rs) >= LINESIZ)
+ memmove(text, rs, LINESIZ);
+ else {
+ memmove(text, rs, len);
+ memmove(text + len, ring, LINESIZ - len);
+ }
+ if (++rs == endring)
+ rs = ring;
+ text[LINESIZ] = '\r';
+ text[LINESIZ + 1] = '\n';
+ (void) sendto(s, text, sizeof(text), 0, &sa, sizeof(sa));
+}
+
+/*
+ * Return a machine readable date and time, in the form of the
+ * number of seconds since midnight, Jan 1, 1900. Since gettimeofday
+ * returns the number of seconds since midnight, Jan 1, 1970,
+ * we must add 2208988800 seconds to this figure to make up for
+ * some seventy years Bell Labs was asleep.
+ */
+
+u_int
+machtime()
+{
+ struct timeval tv;
+
+ if (gettimeofday(&tv, NULL) < 0) {
+ fprintf(stderr, "Unable to get time of day\n");
+ return (0L);
+ }
+ return (htonl((u_int)tv.tv_sec + 2208988800UL));
+}
+
+/* ARGSUSED */
+void
+machtime_stream(s, sep)
+ int s;
+ struct servtab *sep;
+{
+ u_int result;
+
+ result = machtime();
+ (void) write(s, (char *) &result, sizeof(result));
+}
+
+/* ARGSUSED */
+void
+machtime_dg(s, sep)
+ int s;
+ struct servtab *sep;
+{
+ u_int result;
+ /* struct sockaddr_storage ss; */
+ struct sockaddr sa;
+ struct sockaddr_in *sin;
+ int size;
+
+ size = sizeof(sa);
+ if (recvfrom(s, (char *)&result, sizeof(result), 0,
+ &sa, &size) < 0)
+ return;
+ /* if (dg_badinput((struct sockaddr *)&ss)) */
+ sin = (struct sockaddr_in *) &sa;
+ if (sin->sin_addr.s_addr == htonl (INADDR_BROADCAST) ||
+ ntohs (sin->sin_port) < IPPORT_RESERVED / 2)
+ return;
+ result = machtime();
+ (void) sendto(s, (char *) &result, sizeof(result), 0,
+ &sa, sizeof(sa));
+}
+
+/* ARGSUSED */
+void
+daytime_stream(s, sep) /* Return human-readable time of day */
+ int s;
+ struct servtab *sep;
+{
+ char buffer[256];
+ time_t clock;
+
+ clock = time(NULL);
+
+ (void) sprintf(buffer, "%.24s\r\n", ctime(&clock));
+ (void) write(s, buffer, strlen(buffer));
+}
+
+/* ARGSUSED */
+void
+daytime_dg(s, sep) /* Return human-readable time of day */
+ int s;
+ struct servtab *sep;
+{
+ char buffer[256];
+ time_t clock;
+ /* struct sockaddr_storage ss; */
+ struct sockaddr sa;
+ int size;
+
+ clock = time((time_t *) 0);
+
+ size = sizeof(sa);
+ if (recvfrom(s, buffer, sizeof(buffer), 0, &sa,
+ &size) < 0)
+ return;
+ if (dg_badinput((struct sockaddr_in *)&sa))
+ return;
+ (void) sprintf(buffer, "%.24s\r\n", ctime(&clock));
+ (void) sendto(s, buffer, strlen(buffer), 0, &sa,
+ sizeof(sa));
+}
+
+/*
+ * print_service:
+ * Dump relevant information to stderr
+ */
+void
+print_service(action, sep)
+ char *action;
+ struct servtab *sep;
+{
+ if (strcmp(sep->se_hostaddr, "*") == 0)
+ fprintf(stderr, "%s: %s ", action, sep->se_service);
+ else
+ fprintf(stderr, "%s: %s:%s ", action, sep->se_hostaddr,
+ sep->se_service);
+
+ if (isrpcservice(sep))
+ fprintf(stderr, "rpcprog=%d, rpcvers=%d/%d, proto=%s,",
+ sep->se_rpcprog, sep->se_rpcversh,
+ sep->se_rpcversl, sep->se_proto);
+ else
+ fprintf(stderr, "proto=%s,", sep->se_proto);
+
+ fprintf(stderr,
+ " wait.max=%hd.%d user:group=%s.%s builtin=%lx server=%s\n",
+ sep->se_wait, sep->se_max, sep->se_user,
+ sep->se_group ? sep->se_group : "wheel",
+ (long)sep->se_bi, sep->se_server);
+}
Index: inetd-new
===================================================================
--- inetd-new (nonexistent)
+++ inetd-new (revision 5)
Property changes on: inetd-new
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: .
===================================================================
--- . (nonexistent)
+++ . (revision 5)
Property changes on: .
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Radix cross Linux
The main Radix cross Linux repository contains the build scripts of packages, which have the most complete and common functionality for desktop machines
452 Commits
2 Branches
1 Tag