inetd actually supports stream and datagram sockets only

ok deraadt@

2 files changed, 8 insertions, 18 deletions

diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index 36cd460d4c7..97fab475a94 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inetd.8,v 1.40 2015/11/14 01:22:04 jmc Exp $
+.\"	$OpenBSD: inetd.8,v 1.41 2017/10/04 19:52:26 jca Exp $
 .\" Copyright (c) 1985, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -28,7 +28,7 @@
 .\"
 .\"     from: @(#)inetd.8	6.7 (Berkeley) 3/16/91
 .\"
-.Dd $Mdocdate: November 14 2015 $
+.Dd $Mdocdate: October 4 2017 $
 .Dt INETD 8
 .Os
 .Sh NAME
@@ -174,14 +174,10 @@ sockets this field specifies the path name of the socket.
 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
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 2e3e5b174b6..8b7c8f3a8e2 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inetd.c,v 1.155 2017/10/04 18:08:26 benno Exp $	*/
+/*	$OpenBSD: inetd.c,v 1.156 2017/10/04 19:52:26 jca Exp $	*/
 
 /*
  * Copyright (c) 1983,1991 The Regents of the University of California.
@@ -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;