Commit 3dd3e452 authored by Marco d'Itri's avatar Marco d'Itri

Merge upstream release v0.20160825

parents c0966d60 5f6482b6
2016-08-25 07:23 tedu
* inetd.c: remove lint comments
2016-03-30 08:38 jmc
* Makefile: for some time now mandoc has not required MLINKS to
function correctly - logically complete that now by removing
MLINKS from base;
authors need only to ensure there is an entry in NAME for any
function/ util being added. MLINKS will still work, and remain
for perl to ease upgrades;
ok nicm (curses) bcook (ssl) ok schwarze, who provided a lot of
feedback and assistance ok tb natano jung
2016-03-16 21:16 mestre
* inetd.c: Remove a (now) obsolete comment about shortened IPv4
OK deraadt@ jca@
2016-03-16 21:15 mestre
* inetd.c: Replace strncpy(3) calls for safer strlcpy(3)
OK deraadt@ jca@
2016-03-16 21:09 mestre
* inetd.c: Replace atoi(3) calls for safer strtonum(3)
OK deeradt@ jca@
2015-12-22 20:44 mmcc
* inetd.c: remove a NULL-check before free()
2015-11-14 02:22 jmc
* inetd.8: these files document their config files too: adjust NAME
accordingly; ok schwarze
2015-11-01 20:59 deraadt
* inetd.c: needs pledge "cpath" to allow unlink of AF_UNIX sockets
2015-11-01 01:31 deraadt
* inetd.c: inetd needs pledge "unix" to bind AF_UNIX sockets
2015-10-22 14:34 deraadt
* inetd.c: pledge "abort" left behind accidentally
2015-10-19 13:52 jca
* inetd.c: optarg and optind are declared by unistd.h
2015-10-19 13:51 jca
* inetd.c: Add err.h, missing after pledge() introduction.
2015-10-18 18:11 jca
* inetd.c: Make use of pledge(2); initial diff from deraadt@
As Theo says, there's probably room for stricter pledge requests,
but this would involve refactoring.
2015-10-18 17:28 deraadt
* inetd.8: actually, it uses getaddrinfo
2015-09-10 17:16 schwarze
* inetd.8: reduce .Nd to one line and kill .Tn while here
2015-01-16 07:40 deraadt
* inetd.c: Replace <sys/param.h> with <limits.h> and other less
dirty headers where possible. Annotate <sys/param.h> lines with
their current reasons. Switch to PATH_MAX, NGROUPS_MAX,
HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change MIN() and MAX() to
local definitions of MINIMUM() and MAXIMUM() where sensible to
avoid pulling in the pollution. These are the files confirmed
through binary verification. ok guenther, millert, doug (helped
with the verification protocol)
2014-10-29 04:33 dlg
* Makefile, inetd.c: replace the use of select and hand rolled
deferral of signal handling with libevent.
this has been in snaps for a while without any negative (or
positive) feedback.
review and tweaks by bluhm@ nicm@ ok bluhm@ deraadt@
2014-10-13 03:56 dlg
* inetd.8: jmc@ told me i broke the documentation. inetd doesnt
write a pidfile so we shouldnt say it does.
2014-10-13 03:53 dlg
* inetd.c: dont need to store the same debug flag in two separate
ok millert@ deraadt@
2014-10-12 11:36 dlg
* inetd.c: ansi function declarations.
ok gcc+sha256
2014-10-12 10:55 dlg
* inetd.c, pathnames.h: cut out writing a pidfile. rc.d doesnt rely
on it, and nor should you.
both bcook@ and schwartz@ suggested removing the pidfil unlink
and path ok sthen@ schwartz@
2014-06-17 05:12 lteo
* inetd.c: Convert malloc/memset to calloc, and remove pointless
casts while here.
From Benjamin Baier.
2014-04-19 00:04 jmc
* inetd.8: remove references to rshd;
# $OpenBSD: Makefile,v 1.2 1997/09/21 11:43:44 deraadt Exp $
# $OpenBSD: Makefile,v 1.4 2014/10/29 03:33:14 dlg Exp $
PROG= inetd
LDADD= -levent
MAN= inetd.8
MLINKS= inetd.8 inetd.conf.5
.include <>
.\" $OpenBSD: inetd.8,v 1.35 2012/03/06 01:25:47 dlg Exp $
.\" $OpenBSD: inetd.8,v 1.39 2015/10/18 15:28:03 deraadt Exp $
.\" Copyright (c) 1985, 1991 The Regents of the University of California.
.\" All rights reserved.
......@@ -28,13 +28,13 @@
.\" from: @(#)inetd.8 6.7 (Berkeley) 3/16/91
.Dd $Mdocdate: April 18 2014 $
.Dd $Mdocdate: November 14 2015 $
.Nm inetd
.Nd internet
.Dq super-server
.Nm inetd ,
.Nm inetd.conf
.Nd internet super-server
.Nm inetd
.Op Fl d
......@@ -120,7 +120,7 @@ Numeric IP
addresses in dotted-quad notation can be used as well as symbolic
Symbolic hostnames are looked up using
.Fn gethostbyname .
.Fn getaddrinfo .
If a hostname has multiple address mappings, inetd creates a socket
to listen on each address.
......@@ -330,10 +330,6 @@ rereads its configuration file when it receives a hangup signal,
Services may be added, deleted or modified when the configuration file
is reread.
.Nm inetd
creates a file
.Em /var/run/
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 processes for the same server program,
This diff is collapsed.
......@@ -27,10 +27,9 @@
* from: @(#)pathnames.h 5.3 (Berkeley) 6/1/90
* $Id: pathnames.h,v 1.2 2003/06/02 23:36:53 millert Exp $
* $Id: pathnames.h,v 1.3 2014/10/12 08:55:25 dlg Exp $
#include <paths.h>
#define _PATH_INETDCONF "/etc/inetd.conf"
#define _PATH_INETDPID "/var/run/"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment