Remove, the now very outdated, timed.

Submitted by:	Kyle Spiers ksspiers at gmail
Reviewed by:	bcr,brooks,bz,sbruno
Relnotes:	yes
Differential Revision:	https://reviews.freebsd.org/D18505

5 files changed, 3 insertions, 226 deletions

diff --git a/bin/date/Makefile b/bin/date/Makefile
index 5e2e3d261536..c7807eb7a760 100644
--- a/bin/date/Makefile
+++ b/bin/date/Makefile
@@ -5,7 +5,7 @@
 
 PACKAGE=runtime
 PROG=	date
-SRCS=	date.c netdate.c vary.c
+SRCS=	date.c vary.c
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
diff --git a/bin/date/Makefile.depend b/bin/date/Makefile.depend
index 4bd09984c29d..6cfaab1c3644 100644
--- a/bin/date/Makefile.depend
+++ b/bin/date/Makefile.depend
@@ -4,7 +4,6 @@
 DIRDEPS = \
 	gnu/lib/csu \
 	include \
-	include/protocols \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
diff --git a/bin/date/date.c b/bin/date/date.c
index a658ae1c38a6..2068992761d4 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <utmpx.h>
 
-#include "extern.h"
 #include "vary.h"
 
 #ifndef	TM_YEAR_BASE
@@ -67,7 +66,6 @@ __FBSDID("$FreeBSD$");
 #endif
 
 static time_t tval;
-int retval;
 
 static void badformat(void);
 static void iso8601_usage(const char *);
@@ -248,7 +246,7 @@ printdate(const char *buf)
 	(void)printf("%s\n", buf);
 	if (fflush(stdout))
 		err(1, "stdout");
-	exit(retval);
+	exit(EXIT_SUCCESS);
 }
 
 static void
@@ -370,7 +368,7 @@ setthetime(const char *fmt, const char *p, int jflag, int nflag)
 
 	if (!jflag) {
 		/* set the time */
-		if (nflag || netsettime(tval)) {
+		if (nflag) {
 			utx.ut_type = OLD_TIME;
 			memset(utx.ut_id, 0, sizeof(utx.ut_id));
 			(void)gettimeofday(&utx.ut_tv, NULL);
diff --git a/bin/date/extern.h b/bin/date/extern.h
deleted file mode 100644
index 509f77e95fd3..000000000000
--- a/bin/date/extern.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Copyright (c) 1993
- *	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. 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.
- *
- *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
- */
-
-extern int retval;
-
-int	netsettime(time_t);
diff --git a/bin/date/netdate.c b/bin/date/netdate.c
deleted file mode 100644
index ab16951e85ac..000000000000
--- a/bin/date/netdate.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Copyright (c) 1990, 1993
- *	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. 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.
- */
-
-#if 0
-#ifndef lint
-static char sccsid[] = "@(#)netdate.c	8.1 (Berkeley) 5/31/93";
-#endif /* not lint */
-#endif
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netdb.h>
-#define TSPTYPES
-#include <protocols/timed.h>
-
-#include <err.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "extern.h"
-
-#define	WAITACK		2	/* seconds */
-#define	WAITDATEACK	5	/* seconds */
-
-/*
- * Set the date in the machines controlled by timedaemons by communicating the
- * new date to the local timedaemon.  If the timedaemon is in the master state,
- * it performs the correction on all slaves.  If it is in the slave state, it
- * notifies the master that a correction is needed.
- * Returns 0 on success.  Returns > 0 on failure, setting retval to 2;
- */
-int
-netsettime(time_t tval)
-{
-	struct timeval tout;
-	struct servent *sp;
-	struct tsp msg;
-	struct sockaddr_in lsin, dest, from;
-	fd_set ready;
-	long waittime;
-	int s, port, timed_ack, found, lerr;
-	socklen_t length;
-	char hostname[MAXHOSTNAMELEN];
-
-	if ((sp = getservbyname("timed", "udp")) == NULL) {
-		warnx("timed/udp: unknown service");
-		return (retval = 2);
-	}
-
-	dest.sin_port = sp->s_port;
-	dest.sin_family = AF_INET;
-	dest.sin_addr.s_addr = htonl((u_long)INADDR_ANY);
-	s = socket(AF_INET, SOCK_DGRAM, 0);
-	if (s < 0) {
-		if (errno != EAFNOSUPPORT)
-			warn("timed");
-		return (retval = 2);
-	}
-
-	memset(&lsin, 0, sizeof(lsin));
-	lsin.sin_family = AF_INET;
-	for (port = IPPORT_RESERVED - 1; port > IPPORT_RESERVED / 2; port--) {
-		lsin.sin_port = htons((u_short)port);
-		if (bind(s, (struct sockaddr *)&lsin, sizeof(lsin)) >= 0)
-			break;
-		if (errno == EADDRINUSE)
-			continue;
-		if (errno != EADDRNOTAVAIL)
-			warn("bind");
-		goto bad;
-	}
-	if (port == IPPORT_RESERVED / 2) {
-		warnx("all ports in use");
-		goto bad;
-	}
-	memset(&msg, 0, sizeof(msg));
-	msg.tsp_type = TSP_SETDATE;
-	msg.tsp_vers = TSPVERSION;
-	if (gethostname(hostname, sizeof(hostname))) {
-		warn("gethostname");
-		goto bad;
-	}
-	(void)strlcpy(msg.tsp_name, hostname, sizeof(msg.tsp_name));
-	msg.tsp_seq = htons((u_short)0);
-	msg.tsp_time.tv_sec = htonl((u_long)tval);
-	msg.tsp_time.tv_usec = htonl((u_long)0);
-	length = sizeof(struct sockaddr_in);
-	if (connect(s, (struct sockaddr *)&dest, length) < 0) {
-		warn("connect");
-		goto bad;
-	}
-	if (send(s, (char *)&msg, sizeof(struct tsp), 0) < 0) {
-		if (errno != ECONNREFUSED)
-			warn("send");
-		goto bad;
-	}
-
-	timed_ack = -1;
-	waittime = WAITACK;
-loop:
-	tout.tv_sec = waittime;
-	tout.tv_usec = 0;
-
-	FD_ZERO(&ready);
-	FD_SET(s, &ready);
-	found = select(FD_SETSIZE, &ready, (fd_set *)0, (fd_set *)0, &tout);
-
-	length = sizeof(lerr);
-	if (!getsockopt(s,
-	    SOL_SOCKET, SO_ERROR, (char *)&lerr, &length) && lerr) {
-		if (lerr != ECONNREFUSED)
-			warnc(lerr, "send (delayed error)");
-		goto bad;
-	}
-
-	if (found > 0 && FD_ISSET(s, &ready)) {
-		length = sizeof(struct sockaddr_in);
-		if (recvfrom(s, &msg, sizeof(struct tsp), 0,
-		    (struct sockaddr *)&from, &length) < 0) {
-			if (errno != ECONNREFUSED)
-				warn("recvfrom");
-			goto bad;
-		}
-		msg.tsp_seq = ntohs(msg.tsp_seq);
-		msg.tsp_time.tv_sec = ntohl(msg.tsp_time.tv_sec);
-		msg.tsp_time.tv_usec = ntohl(msg.tsp_time.tv_usec);
-		switch (msg.tsp_type) {
-		case TSP_ACK:
-			timed_ack = TSP_ACK;
-			waittime = WAITDATEACK;
-			goto loop;
-		case TSP_DATEACK:
-			(void)close(s);
-			return (0);
-		default:
-			warnx("wrong ack received from timed: %s",
-			    tsptype[msg.tsp_type]);
-			timed_ack = -1;
-			break;
-		}
-	}
-	if (timed_ack == -1)
-		warnx("can't reach time daemon, time set locally");
-
-bad:
-	(void)close(s);
-	return (retval = 2);
-}