[Midnightbsd-cvs] src [11395] trunk/libexec/rbootd: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jul 6 20:59:47 EDT 2018
Revision: 11395
http://svnweb.midnightbsd.org/src/?rev=11395
Author: laffer1
Date: 2018-07-06 20:59:46 -0400 (Fri, 06 Jul 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/libexec/rbootd/Makefile
trunk/libexec/rbootd/bpf.c
trunk/libexec/rbootd/conf.c
trunk/libexec/rbootd/defs.h
trunk/libexec/rbootd/parseconf.c
trunk/libexec/rbootd/pathnames.h
trunk/libexec/rbootd/rbootd.8
trunk/libexec/rbootd/rbootd.c
trunk/libexec/rbootd/rmp.h
trunk/libexec/rbootd/rmp_var.h
trunk/libexec/rbootd/rmpproto.c
trunk/libexec/rbootd/utils.c
Property Changed:
----------------
trunk/libexec/rbootd/rbootd.8
Modified: trunk/libexec/rbootd/Makefile
===================================================================
--- trunk/libexec/rbootd/Makefile 2018-07-07 00:59:29 UTC (rev 11394)
+++ trunk/libexec/rbootd/Makefile 2018-07-07 00:59:46 UTC (rev 11395)
@@ -1,6 +1,6 @@
+# $MidnightBSD$
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/libexec/rbootd/Makefile,v 1.12 2002/02/04 02:33:50 kris Exp $
-# $MidnightBSD: src/libexec/rbootd/Makefile,v 1.2 2012/04/11 00:46:55 laffer1 Exp $
+# $FreeBSD: stable/10/libexec/rbootd/Makefile 201380 2010-01-02 09:50:19Z ed $
PROG= rbootd
SRCS= bpf.c conf.c parseconf.c rbootd.c rmpproto.c utils.c
Modified: trunk/libexec/rbootd/bpf.c
===================================================================
--- trunk/libexec/rbootd/bpf.c 2018-07-07 00:59:29 UTC (rev 11394)
+++ trunk/libexec/rbootd/bpf.c 2018-07-07 00:59:46 UTC (rev 11395)
@@ -19,11 +19,7 @@
* 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -50,7 +46,7 @@
static const char sccsid[] = "@(#)bpf.c 8.1 (Berkeley) 6/4/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/libexec/rbootd/bpf.c,v 1.11 2002/02/07 23:57:00 imp Exp $";
+ "$FreeBSD: stable/10/libexec/rbootd/bpf.c 262435 2014-02-24 08:21:49Z brueffer $";
#endif /* not lint */
#include <sys/param.h>
Modified: trunk/libexec/rbootd/conf.c
===================================================================
--- trunk/libexec/rbootd/conf.c 2018-07-07 00:59:29 UTC (rev 11394)
+++ trunk/libexec/rbootd/conf.c 2018-07-07 00:59:46 UTC (rev 11395)
@@ -19,11 +19,7 @@
* 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -50,7 +46,7 @@
static const char sccsid[] = "@(#)conf.c 8.1 (Berkeley) 6/4/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/libexec/rbootd/conf.c,v 1.5 1999/08/28 00:09:44 peter Exp $";
+ "$FreeBSD: stable/10/libexec/rbootd/conf.c 262435 2014-02-24 08:21:49Z brueffer $";
#endif /* not lint */
#include <sys/param.h>
Modified: trunk/libexec/rbootd/defs.h
===================================================================
--- trunk/libexec/rbootd/defs.h 2018-07-07 00:59:29 UTC (rev 11394)
+++ trunk/libexec/rbootd/defs.h 2018-07-07 00:59:46 UTC (rev 11395)
@@ -19,11 +19,7 @@
* 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@
* From: Utah Hdr: defs.h 3.1 92/07/06
* Author: Jeff Forys, University of Utah CSS
*
- * $FreeBSD: src/libexec/rbootd/defs.h,v 1.4 2002/02/07 23:57:00 imp Exp $
+ * $FreeBSD: stable/10/libexec/rbootd/defs.h 262435 2014-02-24 08:21:49Z brueffer $
*/
#include "rmp.h"
Modified: trunk/libexec/rbootd/parseconf.c
===================================================================
--- trunk/libexec/rbootd/parseconf.c 2018-07-07 00:59:29 UTC (rev 11394)
+++ trunk/libexec/rbootd/parseconf.c 2018-07-07 00:59:46 UTC (rev 11395)
@@ -19,11 +19,7 @@
* 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -50,7 +46,7 @@
static const char sccsid[] = "@(#)parseconf.c 8.1 (Berkeley) 6/4/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/libexec/rbootd/parseconf.c,v 1.11 2002/02/07 23:57:00 imp Exp $";
+ "$FreeBSD: stable/10/libexec/rbootd/parseconf.c 262435 2014-02-24 08:21:49Z brueffer $";
#endif /* not lint */
#include <sys/param.h>
@@ -146,7 +142,7 @@
*/
if ((addr = ParseAddr(bcp)) == NULL) {
syslog(LOG_ERR,
- "ParseConfig: line %d: cant parse <%s>",
+ "ParseConfig: line %d: can't parse <%s>",
linecnt, bcp);
continue;
}
@@ -194,7 +190,7 @@
/*
* Restricted list of boot files were spec'd,
* however, none of them were found. Since we
- * apparently cant let them boot "just anything",
+ * apparently can't let them boot "just anything",
* the entire record is invalidated.
*/
if (i == 0) {
@@ -356,7 +352,7 @@
(void) closedir(dfd); /* close BootDir */
- if (i == 0) /* cant find any boot files */
+ if (i == 0) /* can't find any boot files */
syslog(LOG_ERR, "GetBootFiles: no boot files (%s)\n", BootDir);
return(i);
Modified: trunk/libexec/rbootd/pathnames.h
===================================================================
--- trunk/libexec/rbootd/pathnames.h 2018-07-07 00:59:29 UTC (rev 11394)
+++ trunk/libexec/rbootd/pathnames.h 2018-07-07 00:59:46 UTC (rev 11395)
@@ -19,11 +19,7 @@
* 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -43,6 +39,8 @@
*
* From: Utah Hdr: pathnames.h 3.1 92/07/06
* Author: Jeff Forys, University of Utah CSS
+ *
+ * $FreeBSD: stable/10/libexec/rbootd/pathnames.h 262435 2014-02-24 08:21:49Z brueffer $
*/
#define _PATH_BPF "/dev/bpf%d"
Modified: trunk/libexec/rbootd/rbootd.8
===================================================================
--- trunk/libexec/rbootd/rbootd.8 2018-07-07 00:59:29 UTC (rev 11394)
+++ trunk/libexec/rbootd/rbootd.8 2018-07-07 00:59:46 UTC (rev 11395)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1988, 1992 The University of Utah and the Center
.\" for Software Science (CSS).
.\" Copyright (c) 1992, 1993
@@ -17,11 +18,7 @@
.\" 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. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
@@ -38,8 +35,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rbootd.8 8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/libexec/rbootd/rbootd.8,v 1.14 2004/07/02 21:28:48 ru Exp $
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/libexec/rbootd/rbootd.8 262435 2014-02-24 08:21:49Z brueffer $
.\"
.\" Utah Hdr: rbootd.man 3.1 92/07/06
.\" Author: Jeff Forys, University of Utah CSS
@@ -104,14 +100,14 @@
A pound sign causes the remainder of a line to be ignored.
.Pp
Here is a sample configuration file:
-.Bl -column 08:00:09:0:66:ad SYSHPBSD,SYSHPUX
-.It #
-.It "# ethernet addr boot file(s) comments
-.It #
-.It "08:00:09:0:66:ad SYSHPBSD # snake (4.3BSD)
-.It "08:00:09:0:59:5b # vandy (anything)
-.It "8::9:1:C6:75 SYSHPBSD,SYSHPUX # jaguar (either)
-.El
+.Bd -literal
+#
+# ethernet addr boot file(s) comments
+#
+08:00:09:0:66:ad SYSHPBSD # snake (4.3BSD)
+08:00:09:0:59:5b # vandy (anything)
+8::9:1:C6:75 SYSHPBSD,SYSHPUX # jaguar (either)
+.Ed
.Pp
The
.Nm
@@ -127,7 +123,7 @@
process using the
.Xr kill 1
command:
-.Bl -tag -width SIGUSR1 -offset -compact
+.Bl -tag -width SIGUSR1 -offset xxxxxxxx
.It SIGHUP
Drop all active connections and reconfigure.
.It SIGUSR1
Property changes on: trunk/libexec/rbootd/rbootd.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/rbootd/rbootd.c
===================================================================
--- trunk/libexec/rbootd/rbootd.c 2018-07-07 00:59:29 UTC (rev 11394)
+++ trunk/libexec/rbootd/rbootd.c 2018-07-07 00:59:46 UTC (rev 11395)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/libexec/rbootd/rbootd.c,v 1.2 2012/04/11 00:46:55 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
* for Software Science (CSS).
@@ -19,11 +19,7 @@
* 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -55,9 +51,9 @@
#if 0
static const char sccsid[] = "@(#)rbootd.c 8.1 (Berkeley) 6/4/93";
#endif
-static const char rcsid[] =
- "$FreeBSD: src/libexec/rbootd/rbootd.c,v 1.14 2004/08/21 07:23:41 maxim Exp $";
#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: stable/10/libexec/rbootd/rbootd.c 262435 2014-02-24 08:21:49Z brueffer $");
#include <sys/param.h>
#include <sys/time.h>
@@ -232,7 +228,7 @@
r = rset;
- if (RmpConns == NULL) { /* timeout isnt necessary */
+ if (RmpConns == NULL) { /* timeout isn't necessary */
nsel = select(maxfds, &r, NULL, NULL, NULL);
} else {
timeout.tv_sec = RMP_TIMEOUT;
@@ -311,16 +307,15 @@
DoTimeout(void)
{
RMPCONN *rtmp;
- struct timeval now;
+ time_t now;
- (void) gettimeofday(&now, (struct timezone *)0);
-
/*
* For each active connection, if RMP_TIMEOUT seconds have passed
* since the last packet was sent, delete the connection.
*/
+ now = time(NULL);
for (rtmp = RmpConns; rtmp != NULL; rtmp = rtmp->next)
- if ((rtmp->tstamp.tv_sec + RMP_TIMEOUT) < now.tv_sec) {
+ if ((rtmp->tstamp.tv_sec + RMP_TIMEOUT) < now) {
syslog(LOG_WARNING, "%s: connection timed out (%u)",
EnetStr(rtmp), rtmp->rmp.r_type);
RemoveConn(rtmp);
Modified: trunk/libexec/rbootd/rmp.h
===================================================================
--- trunk/libexec/rbootd/rmp.h 2018-07-07 00:59:29 UTC (rev 11394)
+++ trunk/libexec/rbootd/rmp.h 2018-07-07 00:59:46 UTC (rev 11395)
@@ -19,11 +19,7 @@
* 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -43,6 +39,8 @@
*
* From: Utah Hdr: rmp.h 3.1 92/07/06
* Author: Jeff Forys, University of Utah CSS
+ *
+ * $FreeBSD: stable/10/libexec/rbootd/rmp.h 262435 2014-02-24 08:21:49Z brueffer $
*/
/*
Modified: trunk/libexec/rbootd/rmp_var.h
===================================================================
--- trunk/libexec/rbootd/rmp_var.h 2018-07-07 00:59:29 UTC (rev 11394)
+++ trunk/libexec/rbootd/rmp_var.h 2018-07-07 00:59:46 UTC (rev 11395)
@@ -19,11 +19,7 @@
* 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -43,6 +39,8 @@
*
* from: Utah Hdr: rmp_var.h 3.1 92/07/06
* Author: Jeff Forys, University of Utah CSS
+ *
+ * $FreeBSD: stable/10/libexec/rbootd/rmp_var.h 262435 2014-02-24 08:21:49Z brueffer $
*/
/*
Modified: trunk/libexec/rbootd/rmpproto.c
===================================================================
--- trunk/libexec/rbootd/rmpproto.c 2018-07-07 00:59:29 UTC (rev 11394)
+++ trunk/libexec/rbootd/rmpproto.c 2018-07-07 00:59:46 UTC (rev 11395)
@@ -19,11 +19,7 @@
* 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -50,7 +46,7 @@
static const char sccsid[] = "@(#)rmpproto.c 8.1 (Berkeley) 6/4/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/libexec/rbootd/rmpproto.c,v 1.9 2004/05/24 11:59:16 stefanf Exp $";
+ "$FreeBSD: stable/10/libexec/rbootd/rmpproto.c 262435 2014-02-24 08:21:49Z brueffer $";
#endif /* not lint */
#include <sys/param.h>
@@ -402,7 +398,7 @@
int madeconn = 0;
/*
- * Find the old connection. If one doesnt exist, create one only
+ * Find the old connection. If one doesn't exist, create one only
* to return the error code.
*/
if ((oldconn = FindConn(rconn)) == NULL) {
@@ -516,7 +512,7 @@
struct rmp_packet *rpl;
/*
- * If we cant find the connection, ignore the request.
+ * If we can't find the connection, ignore the request.
*/
if ((oldconn = FindConn(rconn)) == NULL) {
syslog(LOG_ERR, "BootDone: no existing connection (%s)",
@@ -576,7 +572,7 @@
/*
* Last time this connection was active.
*/
- (void) gettimeofday(&rconn->tstamp, (struct timezone *)0);
+ (void)gettimeofday(&rconn->tstamp, NULL);
if (DbgFp != NULL) /* display packet */
DispPkt(rconn,DIR_SENT);
Modified: trunk/libexec/rbootd/utils.c
===================================================================
--- trunk/libexec/rbootd/utils.c 2018-07-07 00:59:29 UTC (rev 11394)
+++ trunk/libexec/rbootd/utils.c 2018-07-07 00:59:46 UTC (rev 11395)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/libexec/rbootd/utils.c,v 1.2 2012/04/11 00:46:55 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
* for Software Science (CSS).
@@ -19,11 +19,7 @@
* 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -50,7 +46,7 @@
static const char sccsid[] = "@(#)utils.c 8.1 (Berkeley) 6/4/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/libexec/rbootd/utils.c,v 1.8 2004/05/24 11:59:16 stefanf Exp $";
+ "$FreeBSD: stable/10/libexec/rbootd/utils.c 262435 2014-02-24 08:21:49Z brueffer $";
#endif /* not lint */
#include <sys/param.h>
More information about the Midnightbsd-cvs
mailing list