ok benno@
Jeremie Courreges-Anglas([email protected]) on 2017.10.04 21:19:18 +0200:
>
> In my tests, only SOCK_STREAM and SOCK_DGRAM effectively work (even
> seqpacket on a unix socket is broken), so kill the others. We don't
> even have SOCK_RDM support.
>
> ok?
>
>
> Index: inetd.8
> ===================================================================
> RCS file: /cvs/src/usr.sbin/inetd/inetd.8,v
> retrieving revision 1.40
> diff -u -p -r1.40 inetd.8
> --- inetd.8 14 Nov 2015 01:22:04 -0000 1.40
> +++ inetd.8 4 Oct 2017 19:14:31 -0000
> @@ -174,14 +174,10 @@ sockets this field specifies the path na
> The
> .Em socket type
> should be one of
> -.Dq stream ,
> -.Dq dgram ,
> -.Dq raw ,
> -.Dq rdm ,
> +.Dq stream
> or
> -.Dq seqpacket ,
> -depending on whether the socket is a stream, datagram, raw,
> -reliably delivered message, or sequenced packet socket.
> +.Dq dgram ,
> +depending on whether the socket is a stream or datagram socket.
> .Pp
> The
> .Em protocol
> Index: inetd.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/inetd/inetd.c,v
> retrieving revision 1.155
> diff -u -p -r1.155 inetd.c
> --- inetd.c 4 Oct 2017 18:08:26 -0000 1.155
> +++ inetd.c 4 Oct 2017 19:14:31 -0000
> @@ -55,7 +55,7 @@
> * 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
> + * socket type stream/dgram
> * 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
> @@ -64,7 +64,7 @@
> *
> * For RPC services
> * service name/version must be in /etc/rpc
> - * socket type stream/dgram/raw/rdm/seqpacket
> + * socket type stream/dgram
> * protocol must be in /etc/protocols
> * wait/nowait[.max] single-threaded/multi-threaded
> * user[.group] or user[:group] user to run daemon as
> @@ -1103,12 +1103,6 @@ more:
> 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;
>
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>
