[Midnightbsd-cvs] src [11387] trunk/libexec/rpc.sprayd/sprayd.c: sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 11387
          http://svnweb.midnightbsd.org/src/?rev=11387
Author:   laffer1
Date:     2018-07-06 20:57:14 -0400 (Fri, 06 Jul 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/libexec/rpc.sprayd/Makefile
    trunk/libexec/rpc.sprayd/rpc.sprayd.8
    trunk/libexec/rpc.sprayd/sprayd.c

Property Changed:
----------------
    trunk/libexec/rpc.sprayd/rpc.sprayd.8

Modified: trunk/libexec/rpc.sprayd/Makefile
===================================================================
--- trunk/libexec/rpc.sprayd/Makefile	2018-07-07 00:56:49 UTC (rev 11386)
+++ trunk/libexec/rpc.sprayd/Makefile	2018-07-07 00:57:14 UTC (rev 11387)
@@ -1,5 +1,5 @@
-# $MidnightBSD: src/libexec/rpc.sprayd/Makefile,v 1.2 2012/04/11 00:58:36 laffer1 Exp $
-# $FreeBSD: src/libexec/rpc.sprayd/Makefile,v 1.6 2001/03/26 14:22:08 ru Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/libexec/rpc.sprayd/Makefile 201380 2010-01-02 09:50:19Z ed $
 
 PROG =	rpc.sprayd
 SRCS =	sprayd.c
@@ -11,4 +11,3 @@
 WARNS?=	2
 
 .include <bsd.prog.mk>
-

Modified: trunk/libexec/rpc.sprayd/rpc.sprayd.8
===================================================================
--- trunk/libexec/rpc.sprayd/rpc.sprayd.8	2018-07-07 00:56:49 UTC (rev 11386)
+++ trunk/libexec/rpc.sprayd/rpc.sprayd.8	2018-07-07 00:57:14 UTC (rev 11387)
@@ -1,3 +1,5 @@
+.\" $MidnightBSD$
+.\"	$NetBSD: rpc.sprayd.8,v 1.9 2003/02/25 10:34:50 wiz Exp $
 .\"
 .\" Copyright (c) 1994 Christos Zoulas
 .\" All rights reserved.
@@ -27,14 +29,14 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/libexec/rpc.sprayd/rpc.sprayd.8,v 1.9 2002/07/06 19:19:30 charnier Exp $
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/libexec/rpc.sprayd/rpc.sprayd.8 327793 2018-01-10 21:24:03Z pfg $
 .\"
-.Dd June 22, 1994
+.Dd December 27, 2017
 .Dt RPC.SPRAYD 8
 .Os
 .Sh NAME
-.Nm rpc.sprayd
+.Nm rpc.sprayd ,
+.Nm sprayd
 .Nd spray server
 .Sh SYNOPSIS
 .Nm /usr/libexec/rpc.sprayd


Property changes on: trunk/libexec/rpc.sprayd/rpc.sprayd.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/rpc.sprayd/sprayd.c
===================================================================
--- trunk/libexec/rpc.sprayd/sprayd.c	2018-07-07 00:56:49 UTC (rev 11386)
+++ trunk/libexec/rpc.sprayd/sprayd.c	2018-07-07 00:57:14 UTC (rev 11387)
@@ -1,4 +1,6 @@
 /* $MidnightBSD$ */
+/*	$NetBSD: sprayd.c,v 1.14 2006/05/09 20:18:07 mrg Exp $	*/
+
 /*
  * Copyright (c) 1994 Christos Zoulas
  * All rights reserved.
@@ -31,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/libexec/rpc.sprayd/sprayd.c,v 1.9 2005/02/14 17:42:58 stefanf Exp $";
+  "$FreeBSD: stable/10/libexec/rpc.sprayd/sprayd.c 327793 2018-01-10 21:24:03Z pfg $";
 #endif /* not lint */
 
 #include <rpc/rpc.h>
@@ -63,7 +65,7 @@
 void
 cleanup(int sig __unused)
 {
-	(void) rpcb_unset(SPRAYPROG, SPRAYVERS, NULL);
+	(void)rpcb_unset(SPRAYPROG, SPRAYVERS, NULL);
 	exit(0);
 }
 
@@ -92,17 +94,17 @@
 	if (!from_inetd) {
 		daemon(0, 0);
 
-		(void) rpcb_unset(SPRAYPROG, SPRAYVERS, NULL);
+		(void)rpcb_unset(SPRAYPROG, SPRAYVERS, NULL);
 
-		(void) signal(SIGINT, cleanup);
-		(void) signal(SIGTERM, cleanup);
-		(void) signal(SIGHUP, cleanup);
+		(void)signal(SIGINT, cleanup);
+		(void)signal(SIGTERM, cleanup);
+		(void)signal(SIGHUP, cleanup);
 	} else {
-		(void) signal(SIGALRM, die);
+		(void)signal(SIGALRM, die);
 		alarm(TIMEOUT);
 	}
 
-	openlog("rpc.sprayd", LOG_CONS|LOG_PID, LOG_DAEMON);
+	openlog("rpc.sprayd", LOG_PID, LOG_DAEMON);
 
 	if (from_inetd) {
 		transp = svc_tli_create(0, NULL, NULL, 0, 0);
@@ -119,7 +121,7 @@
 		syslog(LOG_ERR,
 		    "unable to register (SPRAYPROG, SPRAYVERS, %s)",
 		    (!from_inetd)?"udp":"(inetd)");
-		return 1;
+		exit(1);
 	}
 
 	svc_run();
@@ -137,7 +139,7 @@
 	switch (rqstp->rq_proc) {
 	case SPRAYPROC_CLEAR:
 		scum.counter = 0;
-		(void) gettimeofday(&clear, 0);
+		(void)gettimeofday(&clear, 0);
 		/*FALLTHROUGH*/
 
 	case NULLPROC:
@@ -149,7 +151,7 @@
 		return;
 
 	case SPRAYPROC_GET:
-		(void) gettimeofday(&get, 0);
+		(void)gettimeofday(&get, 0);
 		timersub(&get, &clear, &get);
 		scum.clock.sec = get.tv_sec;
 		scum.clock.usec = get.tv_usec;
@@ -162,6 +164,6 @@
 
 	if (!svc_sendreply(transp, (xdrproc_t)xdr_spraycumul, &scum)) {
 		svcerr_systemerr(transp);
-		syslog(LOG_ERR, "bad svc_sendreply");
+		syslog(LOG_WARNING, "bad svc_sendreply");
 	}
 }