[Midnightbsd-cvs] src [11403] trunk/libexec/bootpd: sync with freebsd.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jul 6 21:04:36 EDT 2018
Revision: 11403
http://svnweb.midnightbsd.org/src/?rev=11403
Author: laffer1
Date: 2018-07-06 21:04:36 -0400 (Fri, 06 Jul 2018)
Log Message:
-----------
sync with freebsd.
Modified Paths:
--------------
trunk/libexec/bootpd/Makefile
trunk/libexec/bootpd/Makefile.UNIX
trunk/libexec/bootpd/Makefile.inc
trunk/libexec/bootpd/bootp.h
trunk/libexec/bootpd/bootpd.8
trunk/libexec/bootpd/bootpd.c
trunk/libexec/bootpd/bootpd.h
trunk/libexec/bootpd/bootpgw/Makefile
trunk/libexec/bootpd/bootpgw/bootpgw.c
trunk/libexec/bootpd/bootptab.5
trunk/libexec/bootpd/bootptab.mcs
trunk/libexec/bootpd/bptypes.h
trunk/libexec/bootpd/dovend.c
trunk/libexec/bootpd/dovend.h
trunk/libexec/bootpd/dumptab.c
trunk/libexec/bootpd/getether.c
trunk/libexec/bootpd/getether.h
trunk/libexec/bootpd/getif.c
trunk/libexec/bootpd/getif.h
trunk/libexec/bootpd/hash.c
trunk/libexec/bootpd/hash.h
trunk/libexec/bootpd/hwaddr.c
trunk/libexec/bootpd/hwaddr.h
trunk/libexec/bootpd/lookup.c
trunk/libexec/bootpd/lookup.h
trunk/libexec/bootpd/patchlevel.h
trunk/libexec/bootpd/readfile.c
trunk/libexec/bootpd/readfile.h
trunk/libexec/bootpd/report.c
trunk/libexec/bootpd/report.h
trunk/libexec/bootpd/rtmsg.c
trunk/libexec/bootpd/tools/Makefile
trunk/libexec/bootpd/tools/Makefile.inc
trunk/libexec/bootpd/tools/bootpef/Makefile
trunk/libexec/bootpd/tools/bootpef/bootpef.8
trunk/libexec/bootpd/tools/bootpef/bootpef.c
trunk/libexec/bootpd/tools/bootptest/Makefile
trunk/libexec/bootpd/tools/bootptest/bootptest.8
trunk/libexec/bootpd/tools/bootptest/bootptest.c
trunk/libexec/bootpd/tools/bootptest/bootptest.h
trunk/libexec/bootpd/tools/bootptest/print-bootp.c
trunk/libexec/bootpd/trygetea.c
trunk/libexec/bootpd/trygetif.c
trunk/libexec/bootpd/trylook.c
trunk/libexec/bootpd/tzone.c
trunk/libexec/bootpd/tzone.h
Property Changed:
----------------
trunk/libexec/bootpd/ConvOldTab.sh
trunk/libexec/bootpd/Installation
trunk/libexec/bootpd/Makefile.UNIX
trunk/libexec/bootpd/Makefile.inc
trunk/libexec/bootpd/ToDo
trunk/libexec/bootpd/bootpd.8
trunk/libexec/bootpd/bootptab.5
trunk/libexec/bootpd/bootptab.mcs
trunk/libexec/bootpd/tools/Makefile.inc
trunk/libexec/bootpd/tools/bootpef/bootpef.8
trunk/libexec/bootpd/tools/bootptest/bootptest.8
Index: trunk/libexec/bootpd/ConvOldTab.sh
===================================================================
--- trunk/libexec/bootpd/ConvOldTab.sh 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/ConvOldTab.sh 2018-07-07 01:04:36 UTC (rev 11403)
Property changes on: trunk/libexec/bootpd/ConvOldTab.sh
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Index: trunk/libexec/bootpd/Installation
===================================================================
--- trunk/libexec/bootpd/Installation 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/Installation 2018-07-07 01:04:36 UTC (rev 11403)
Property changes on: trunk/libexec/bootpd/Installation
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/bootpd/Makefile
===================================================================
--- trunk/libexec/bootpd/Makefile 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/Makefile 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
# bootpd/Makefile
-# $MidnightBSD$
+# $FreeBSD: stable/10/libexec/bootpd/Makefile 201380 2010-01-02 09:50:19Z ed $
PROG= bootpd
CFLAGS+= -DETC_ETHERS
Modified: trunk/libexec/bootpd/Makefile.UNIX
===================================================================
--- trunk/libexec/bootpd/Makefile.UNIX 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/Makefile.UNIX 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/libexec/bootpd/Makefile.UNIX 50476 1999-08-28 00:22:10Z peter $
#
# Makefile for the BOOTP programs:
# bootpd - BOOTP server daemon
Property changes on: trunk/libexec/bootpd/Makefile.UNIX
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/bootpd/Makefile.inc
===================================================================
--- trunk/libexec/bootpd/Makefile.inc 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/Makefile.inc 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/libexec/bootpd/Makefile.inc 201380 2010-01-02 09:50:19Z ed $
BINDIR?= /usr/libexec
Property changes on: trunk/libexec/bootpd/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Index: trunk/libexec/bootpd/ToDo
===================================================================
--- trunk/libexec/bootpd/ToDo 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/ToDo 2018-07-07 01:04:36 UTC (rev 11403)
Property changes on: trunk/libexec/bootpd/ToDo
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/bootpd/bootp.h
===================================================================
--- trunk/libexec/bootpd/bootp.h 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/bootp.h 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/************************************************************************
Copyright 1988, 1991 by Carnegie Mellon University
@@ -23,7 +24,7 @@
/*
* Bootstrap Protocol (BOOTP). RFC951 and RFC1395.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/bootp.h 83941 2001-09-25 21:02:10Z iedowse $
*
*
* This file specifies the "implementation-independent" BOOTP protocol
Modified: trunk/libexec/bootpd/bootpd.8
===================================================================
--- trunk/libexec/bootpd/bootpd.8 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/bootpd.8 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,6 +1,7 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/libexec/bootpd/bootpd.8 233466 2012-03-25 16:00:56Z joel $
.\"
.Dd February 10, 2004
.Dt BOOTPD 8
@@ -263,9 +264,21 @@
Current directory typically used by the TFTP server and
.Nm .
.El
-.Sh BUGS
-Individual host entries must not exceed 1024 characters.
-.Sh CREDITS
+.Sh "SEE ALSO"
+.Xr bootptab 5 ,
+.Xr inetd 8 ,
+.Xr tftpd 8
+.Pp
+DARPA Internet Request For Comments:
+.Bl -tag -width RFC1533 -compact
+.It RFC951
+Bootstrap Protocol
+.It RFC1532
+Clarifications and Extensions for the Bootstrap Protocol
+.It RFC1533
+DHCP Options and BOOTP Vendor Extensions
+.El
+.Sh AUTHORS
This distribution is currently maintained by
.An Walter L. Wimer Aq walt+ at cmu.edu .
.Pp
@@ -294,17 +307,5 @@
.An Jim McKim Aq mckim at lerc.nasa.gov
.An Gordon W. Ross Aq gwr at mc.com
.An Jason Zions Aq jazz at hal.com .
-.Sh "SEE ALSO"
-.Xr bootptab 5 ,
-.Xr inetd 8 ,
-.Xr tftpd 8
-.Pp
-DARPA Internet Request For Comments:
-.Bl -tag -width RFC1533 -compact
-.It RFC951
-Bootstrap Protocol
-.It RFC1532
-Clarifications and Extensions for the Bootstrap Protocol
-.It RFC1533
-DHCP Options and BOOTP Vendor Extensions
-.El
+.Sh BUGS
+Individual host entries must not exceed 1024 characters.
Property changes on: trunk/libexec/bootpd/bootpd.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/bootpd/bootpd.c
===================================================================
--- trunk/libexec/bootpd/bootpd.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/bootpd.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/************************************************************************
Copyright 1988, 1991 by Carnegie Mellon University
@@ -38,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/libexec/bootpd/bootpd.c 229780 2012-01-07 16:09:54Z uqs $");
#include <sys/types.h>
#include <sys/param.h>
@@ -663,7 +664,7 @@
bp->bp_op = BOOTREPLY;
if (bp->bp_ciaddr.s_addr == 0) {
/*
- * client doesnt know his IP address,
+ * client doesn't know his IP address,
* search by hardware address.
*/
if (debug > 1) {
@@ -1119,7 +1120,7 @@
/*
* This call checks read access to a file. It returns 0 if the file given
- * by "path" exists and is publically readable. A value of -1 is returned if
+ * by "path" exists and is publicly readable. A value of -1 is returned if
* access is not permitted or an error occurs. Successful calls also
* return the file size in bytes using the long pointer "filesize".
*
Modified: trunk/libexec/bootpd/bootpd.h
===================================================================
--- trunk/libexec/bootpd/bootpd.h 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/bootpd.h 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/************************************************************************
Copyright 1988, 1991 by Carnegie Mellon University
@@ -24,7 +25,7 @@
/*
* bootpd.h -- common header file for all the modules of the bootpd program.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/bootpd.h 53105 1999-11-12 10:11:48Z marcel $
*/
#include "bptypes.h"
Modified: trunk/libexec/bootpd/bootpgw/Makefile
===================================================================
--- trunk/libexec/bootpd/bootpgw/Makefile 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/bootpgw/Makefile 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,8 +1,9 @@
+# $MidnightBSD$
# Makefile
-# $FreeBSD: src/libexec/bootpd/bootpgw/Makefile,v 1.6 2004/12/21 08:47:03 ru Exp $
+# $FreeBSD: stable/10/libexec/bootpd/bootpgw/Makefile 276486 2014-12-31 23:25:37Z ngie $
PROG= bootpgw
-NO_MAN=
+MAN=
SRCS= bootpgw.c getif.c hwaddr.c report.c rtmsg.c
SRCDIR= ${.CURDIR}/..
Modified: trunk/libexec/bootpd/bootpgw/bootpgw.c
===================================================================
--- trunk/libexec/bootpd/bootpgw/bootpgw.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/bootpgw/bootpgw.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* bootpgw.c - BOOTP GateWay
* This program forwards BOOTP Request packets to a BOOTP server.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/libexec/bootpd/bootpgw/bootpgw.c,v 1.6 2003/02/05 13:45:25 charnier Exp $");
+__FBSDID("$FreeBSD: stable/10/libexec/bootpd/bootpgw/bootpgw.c 229780 2012-01-07 16:09:54Z uqs $");
#include <sys/types.h>
#include <sys/param.h>
@@ -452,7 +453,7 @@
}
if (!(readfds & (1 << s))) {
report(LOG_INFO, "exiting after %ld minutes of inactivity",
- actualtimeout.tv_sec / 60);
+ (long)(actualtimeout.tv_sec / 60));
exit(0);
}
ra_len = sizeof(recv_addr);
@@ -534,7 +535,7 @@
/* Has this packet hopped too many times? */
hops = bp->bp_hops;
if (++hops > maxhops) {
- report(LOG_NOTICE, "reqest from %s reached hop limit",
+ report(LOG_NOTICE, "request from %s reached hop limit",
inet_ntoa(recv_addr.sin_addr));
return;
}
Modified: trunk/libexec/bootpd/bootptab.5
===================================================================
--- trunk/libexec/bootpd/bootptab.5 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/bootptab.5 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,6 +1,7 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/libexec/bootpd/bootptab.5 250582 2013-05-12 22:22:12Z joel $
.\"
.Dd October 31, 1991
.Dt BOOTPTAB 5
@@ -421,7 +422,7 @@
.Ed
.Sh FILES
.Bl -tag -width /etc/bootptab -compact
-.It /etc/bootptab
+.It Pa /etc/bootptab
.El
.Sh "SEE ALSO"
.Xr bootpd 8 ,
Property changes on: trunk/libexec/bootpd/bootptab.5
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/bootpd/bootptab.mcs
===================================================================
--- trunk/libexec/bootpd/bootptab.mcs 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/bootptab.mcs 2018-07-07 01:04:36 UTC (rev 11403)
@@ -2,7 +2,7 @@
# Last update: gwr, Sun Dec 12 19:00:00 EDT 1993
# Blank lines and lines beginning with '#' are ignored.
#
-# $MidnightBSD$
+# $FreeBSD: stable/10/libexec/bootpd/bootptab.mcs 50476 1999-08-28 00:22:10Z peter $
#
# Legend: (see bootptab.5)
# first field -- hostname (not indented)
Property changes on: trunk/libexec/bootpd/bootptab.mcs
___________________________________________________________________
Added: mnbsd:nokeywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/bootpd/bptypes.h
===================================================================
--- trunk/libexec/bootpd/bptypes.h 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/bptypes.h 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/libexec/bootpd/bptypes.h 53105 1999-11-12 10:11:48Z marcel $
*/
#ifndef BPTYPES_H
Modified: trunk/libexec/bootpd/dovend.c
===================================================================
--- trunk/libexec/bootpd/dovend.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/dovend.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,7 +1,8 @@
+/* $MidnightBSD$ */
/*
* dovend.c : Inserts all but the first few vendor options.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/dovend.c 97417 2002-05-28 18:36:43Z alfred $
*/
#include <sys/types.h>
Modified: trunk/libexec/bootpd/dovend.h
===================================================================
--- trunk/libexec/bootpd/dovend.h 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/dovend.h 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* dovend.h */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/libexec/bootpd/dovend.h 97416 2002-05-28 18:31:41Z alfred $ */
extern int dovend_rfc1497(struct host *hp, u_char *buf, int len);
extern int insert_ip(int, struct in_addr_list *, u_char **, int *);
Modified: trunk/libexec/bootpd/dumptab.c
===================================================================
--- trunk/libexec/bootpd/dumptab.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/dumptab.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,7 +1,8 @@
+/* $MidnightBSD$ */
/*
* dumptab.c - handles dumping the database
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/dumptab.c 97417 2002-05-28 18:36:43Z alfred $
*/
#include <sys/types.h>
Modified: trunk/libexec/bootpd/getether.c
===================================================================
--- trunk/libexec/bootpd/getether.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/getether.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* getether.c : get the ethernet address of an interface
*
@@ -7,7 +8,7 @@
* If you figure out how to do this on another system,
* please let me know. <gwr at mc.com>
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/getether.c 108470 2002-12-30 21:18:15Z schweikh $
*/
#include <sys/types.h>
@@ -110,7 +111,7 @@
#endif /* SUNOS */
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__MidnightBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__)
/* Thanks to John Brezak <brezak at ch.hp.com> for this code. */
#include <sys/ioctl.h>
#include <sys/time.h>
Modified: trunk/libexec/bootpd/getether.h
===================================================================
--- trunk/libexec/bootpd/getether.h 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/getether.h 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,4 +1,5 @@
+/* $MidnightBSD$ */
/* getether.h */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/libexec/bootpd/getether.h 97416 2002-05-28 18:31:41Z alfred $ */
extern int getether(char *ifname, char *eaptr);
Modified: trunk/libexec/bootpd/getif.c
===================================================================
--- trunk/libexec/bootpd/getif.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/getif.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,7 +1,8 @@
+/* $MidnightBSD$ */
/*
* getif.c : get an interface structure
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/getif.c 132848 2004-07-29 18:05:20Z kan $
*/
#include <sys/types.h>
Modified: trunk/libexec/bootpd/getif.h
===================================================================
--- trunk/libexec/bootpd/getif.h 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/getif.h 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,4 +1,5 @@
+/* $MidnightBSD$ */
/* getif.h */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/libexec/bootpd/getif.h 97416 2002-05-28 18:31:41Z alfred $ */
extern struct ifreq *getif(int, struct in_addr *);
Modified: trunk/libexec/bootpd/hash.c
===================================================================
--- trunk/libexec/bootpd/hash.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/hash.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/************************************************************************
Copyright 1988, 1991 by Carnegie Mellon University
@@ -19,7 +20,7 @@
ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
- $MidnightBSD$
+ $FreeBSD: stable/10/libexec/bootpd/hash.c 97417 2002-05-28 18:36:43Z alfred $
************************************************************************/
Modified: trunk/libexec/bootpd/hash.h
===================================================================
--- trunk/libexec/bootpd/hash.h 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/hash.h 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
#ifndef HASH_H
#define HASH_H
/* hash.h */
@@ -25,7 +26,7 @@
/*
* Generalized hash table ADT
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/hash.h 229780 2012-01-07 16:09:54Z uqs $
*
* Provides multiple, dynamically-allocated, variable-sized hash tables on
* various data and keys.
@@ -81,7 +82,7 @@
*
* A generalized hash function, hash_HashFunction(), is included
* with this package to make things a little easier. It is not
- * guarenteed to use the best hash algorithm in existence. . . .
+ * guaranteed to use the best hash algorithm in existence. . . .
*/
Modified: trunk/libexec/bootpd/hwaddr.c
===================================================================
--- trunk/libexec/bootpd/hwaddr.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/hwaddr.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,8 +1,9 @@
+/* $MidnightBSD$ */
/*
* hwaddr.c - routines that deal with hardware addresses.
* (i.e. Ethernet)
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/hwaddr.c 105041 2002-10-13 11:27:36Z kris $
*/
#include <sys/types.h>
Modified: trunk/libexec/bootpd/hwaddr.h
===================================================================
--- trunk/libexec/bootpd/hwaddr.h 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/hwaddr.h 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,7 +1,8 @@
+/* $MidnightBSD$ */
/*
* hwaddr.h
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/hwaddr.h 97417 2002-05-28 18:36:43Z alfred $
*/
#ifndef HWADDR_H
Modified: trunk/libexec/bootpd/lookup.c
===================================================================
--- trunk/libexec/bootpd/lookup.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/lookup.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,7 +1,8 @@
+/* $MidnightBSD$ */
/*
* lookup.c - Lookup IP address, HW address, netmask
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/lookup.c 50476 1999-08-28 00:22:10Z peter $
*/
#include <sys/types.h>
Modified: trunk/libexec/bootpd/lookup.h
===================================================================
--- trunk/libexec/bootpd/lookup.h 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/lookup.h 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* lookup.h */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/libexec/bootpd/lookup.h 97416 2002-05-28 18:31:41Z alfred $ */
#include "bptypes.h" /* for int32, u_int32 */
Modified: trunk/libexec/bootpd/patchlevel.h
===================================================================
--- trunk/libexec/bootpd/patchlevel.h 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/patchlevel.h 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,7 +1,8 @@
+/* $MidnightBSD$ */
/*
* patchlevel.h
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/patchlevel.h 50476 1999-08-28 00:22:10Z peter $
*/
#define VERSION "2.4"
Modified: trunk/libexec/bootpd/readfile.c
===================================================================
--- trunk/libexec/bootpd/readfile.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/readfile.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/************************************************************************
Copyright 1988, 1991 by Carnegie Mellon University
@@ -19,7 +20,7 @@
ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
- $MidnightBSD$
+ $FreeBSD: stable/10/libexec/bootpd/readfile.c 102411 2002-08-25 13:10:45Z charnier $
************************************************************************/
Modified: trunk/libexec/bootpd/readfile.h
===================================================================
--- trunk/libexec/bootpd/readfile.h 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/readfile.h 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* readfile.h */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/libexec/bootpd/readfile.h 97416 2002-05-28 18:31:41Z alfred $ */
#include "bptypes.h"
#include "hash.h"
Modified: trunk/libexec/bootpd/report.c
===================================================================
--- trunk/libexec/bootpd/report.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/report.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,4 +1,5 @@
/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/libexec/bootpd/report.c 97416 2002-05-28 18:31:41Z alfred $ */
/*
* report() - calls syslog
Modified: trunk/libexec/bootpd/report.h
===================================================================
--- trunk/libexec/bootpd/report.h 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/report.h 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* report.h */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/libexec/bootpd/report.h 97417 2002-05-28 18:36:43Z alfred $ */
extern void report_init(int nolog);
extern void report(int, const char *, ...) __printflike(2, 3);
Modified: trunk/libexec/bootpd/rtmsg.c
===================================================================
--- trunk/libexec/bootpd/rtmsg.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/rtmsg.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1984, 1993
* The Regents of the University of California. All rights reserved.
@@ -16,11 +17,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.
*
@@ -42,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/libexec/bootpd/rtmsg.c 262435 2014-02-24 08:21:49Z brueffer $");
#include <sys/param.h>
/*
@@ -106,9 +103,9 @@
}
static struct sockaddr_in so_mask = {8, 0, 0, { 0xffffffff}};
-static struct sockaddr_inarp blank_sin = {sizeof(blank_sin), AF_INET }, sin_m;
+static struct sockaddr_in blank_sin = {sizeof(blank_sin), AF_INET }, sin_m;
static struct sockaddr_dl blank_sdl = {sizeof(blank_sdl), AF_LINK }, sdl_m;
-static int expire_time, flags, export_only, doing_proxy;
+static int expire_time, flags, doing_proxy;
static struct {
struct rt_msghdr m_rtm;
char m_space[512];
@@ -122,7 +119,7 @@
char *eaddr;
int len;
{
- register struct sockaddr_inarp *sin = &sin_m;
+ register struct sockaddr_in *sin = &sin_m;
register struct sockaddr_dl *sdl;
register struct rt_msghdr *rtm = &(m_rtmsg.m_rtm);
u_char *ea;
@@ -137,7 +134,7 @@
ea = (u_char *)LLADDR(&sdl_m);
bcopy(eaddr, ea, len);
sdl_m.sdl_alen = len;
- doing_proxy = flags = export_only = expire_time = 0;
+ doing_proxy = flags = expire_time = 0;
/* make arp entry temporary */
clock_gettime(CLOCK_MONOTONIC, &tp);
@@ -148,7 +145,7 @@
report(LOG_WARNING, "rtmget: %s", strerror(errno));
return (1);
}
- sin = (struct sockaddr_inarp *)(rtm + 1);
+ sin = (struct sockaddr_in *)(rtm + 1);
sdl = (struct sockaddr_dl *)(sin->sin_len + (char *)sin);
if (sin->sin_addr.s_addr == sin_m.sin_addr.s_addr) {
if (sdl->sdl_family == AF_LINK &&
@@ -163,13 +160,6 @@
inet_ntoa(sin->sin_addr));
return (1);
}
- if (sin_m.sin_other & SIN_PROXY) {
- report(LOG_WARNING,
- "set: proxy entry exists for non 802 device\n");
- return(1);
- }
- sin_m.sin_other = SIN_PROXY;
- export_only = 1;
goto tryagain;
}
overwrite:
@@ -209,14 +199,9 @@
rtm->rtm_rmx.rmx_expire = expire_time;
rtm->rtm_inits = RTV_EXPIRE;
rtm->rtm_flags |= (RTF_HOST | RTF_STATIC | RTF_LLDATA);
- sin_m.sin_other = 0;
if (doing_proxy) {
- if (export_only)
- sin_m.sin_other = SIN_PROXY;
- else {
- rtm->rtm_addrs |= RTA_NETMASK;
- rtm->rtm_flags &= ~RTF_HOST;
- }
+ rtm->rtm_addrs |= RTA_NETMASK;
+ rtm->rtm_flags &= ~RTF_HOST;
}
/* FALLTHROUGH */
case RTM_GET:
Modified: trunk/libexec/bootpd/tools/Makefile
===================================================================
--- trunk/libexec/bootpd/tools/Makefile 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/tools/Makefile 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
# Makefile
-# $MidnightBSD$
+# $FreeBSD: stable/10/libexec/bootpd/tools/Makefile 50476 1999-08-28 00:22:10Z peter $
SUBDIR= bootpef bootptest
Modified: trunk/libexec/bootpd/tools/Makefile.inc
===================================================================
--- trunk/libexec/bootpd/tools/Makefile.inc 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/tools/Makefile.inc 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
# Makefile.inc
-# $MidnightBSD$
+# $FreeBSD: stable/10/libexec/bootpd/tools/Makefile.inc 201380 2010-01-02 09:50:19Z ed $
BINDIR= /usr/sbin
Property changes on: trunk/libexec/bootpd/tools/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/bootpd/tools/bootpef/Makefile
===================================================================
--- trunk/libexec/bootpd/tools/bootpef/Makefile 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/tools/bootpef/Makefile 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
# Makefile
-# $MidnightBSD$
+# $FreeBSD: stable/10/libexec/bootpd/tools/bootpef/Makefile 74814 2001-03-26 14:22:12Z ru $
PROG= bootpef
MAN= bootpef.8
Modified: trunk/libexec/bootpd/tools/bootpef/bootpef.8
===================================================================
--- trunk/libexec/bootpd/tools/bootpef/bootpef.8 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/tools/bootpef/bootpef.8 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,4 +1,5 @@
.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/libexec/bootpd/tools/bootpef/bootpef.8 99500 2002-07-06 19:19:48Z charnier $
.\"
.\" bootpef.8
.Dd December 4, 1993
Property changes on: trunk/libexec/bootpd/tools/bootpef/bootpef.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/bootpd/tools/bootpef/bootpef.c
===================================================================
--- trunk/libexec/bootpd/tools/bootpef/bootpef.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/tools/bootpef/bootpef.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/************************************************************************
Copyright 1988, 1991 by Carnegie Mellon University
@@ -19,7 +20,7 @@
ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
- $MidnightBSD$
+ $FreeBSD: stable/10/libexec/bootpd/tools/bootpef/bootpef.c 97419 2002-05-28 18:39:53Z alfred $
************************************************************************/
Modified: trunk/libexec/bootpd/tools/bootptest/Makefile
===================================================================
--- trunk/libexec/bootpd/tools/bootptest/Makefile 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/tools/bootptest/Makefile 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
# Makefile
-# $MidnightBSD$
+# $FreeBSD: stable/10/libexec/bootpd/tools/bootptest/Makefile 74814 2001-03-26 14:22:12Z ru $
PROG= bootptest
MAN= bootptest.8
Modified: trunk/libexec/bootpd/tools/bootptest/bootptest.8
===================================================================
--- trunk/libexec/bootpd/tools/bootptest/bootptest.8 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/tools/bootptest/bootptest.8 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,4 +1,5 @@
.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/libexec/bootpd/tools/bootptest/bootptest.8 140414 2005-01-18 09:29:40Z ru $
.\"
.\" bootptest.8
.Dd June 10, 1993
Property changes on: trunk/libexec/bootpd/tools/bootptest/bootptest.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/bootpd/tools/bootptest/bootptest.c
===================================================================
--- trunk/libexec/bootpd/tools/bootptest/bootptest.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/tools/bootptest/bootptest.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* bootptest.c - Test out a bootp server.
*
@@ -34,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/libexec/bootpd/tools/bootptest/bootptest.c 229780 2012-01-07 16:09:54Z uqs $");
char *usage = "bootptest [-h] server-name [vendor-data-template-file]";
@@ -186,7 +187,7 @@
break;
switch (argv[0][1]) {
- case 'f': /* File name to reqest. */
+ case 'f': /* File name to request. */
if (argc < 2)
goto error;
argc--; argv++;
Modified: trunk/libexec/bootpd/tools/bootptest/bootptest.h
===================================================================
--- trunk/libexec/bootpd/tools/bootptest/bootptest.h 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/tools/bootptest/bootptest.h 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* bootptest.h */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/libexec/bootpd/tools/bootptest/bootptest.h 97419 2002-05-28 18:39:53Z alfred $ */
/*
* Hacks for sharing print-bootp.c between tcpdump and bootptest.
*/
Modified: trunk/libexec/bootpd/tools/bootptest/print-bootp.c
===================================================================
--- trunk/libexec/bootpd/tools/bootptest/print-bootp.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/tools/bootptest/print-bootp.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,19 +1,19 @@
+/* $MidnightBSD$ */
/*
- * Copyright (c) 1988-1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988-1990
+ * 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: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' 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.
+ * modification, are permitted provided that:
+ * 1. Source code distributions retain the above copyright
+ * notice and this paragraph in its entirety
+ * 2. Distributions including binary code include the above copyright
+ * notice and this paragraph in its entirety in the documentation
+ * or other materials provided with the distribution, and
+ * 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -23,7 +23,7 @@
* This file was copied from tcpdump-2.1.1 and modified.
* There is an e-mail list for tcpdump: <tcpdump at ee.lbl.gov>
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/tools/bootptest/print-bootp.c 263830 2014-03-27 20:13:53Z brueffer $
*/
#include <stdio.h>
@@ -187,7 +187,7 @@
/*
* Option description data follows.
- * These are decribed in: RFC-1048, RFC-1395, RFC-1497, RFC-1533
+ * These are described in: RFC-1048, RFC-1395, RFC-1497, RFC-1533
*
* The first char of each option string encodes the data format:
* ?: unknown
Modified: trunk/libexec/bootpd/trygetea.c
===================================================================
--- trunk/libexec/bootpd/trygetea.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/trygetea.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,7 +1,8 @@
+/* $MidnightBSD$ */
/*
* trygetea.c - test program for getether.c
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/trygetea.c 50476 1999-08-28 00:22:10Z peter $
*/
#include <sys/types.h>
Modified: trunk/libexec/bootpd/trygetif.c
===================================================================
--- trunk/libexec/bootpd/trygetif.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/trygetif.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,7 +1,8 @@
+/* $MidnightBSD$ */
/*
* trygetif.c - test program for getif.c
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/trygetif.c 50476 1999-08-28 00:22:10Z peter $
*/
#include <sys/types.h>
Modified: trunk/libexec/bootpd/trylook.c
===================================================================
--- trunk/libexec/bootpd/trylook.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/trylook.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,7 +1,8 @@
+/* $MidnightBSD$ */
/*
* trylook.c - test program for lookup.c
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/trylook.c 50476 1999-08-28 00:22:10Z peter $
*/
#include <sys/types.h>
Modified: trunk/libexec/bootpd/tzone.c
===================================================================
--- trunk/libexec/bootpd/tzone.c 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/tzone.c 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,9 +1,10 @@
+/* $MidnightBSD$ */
/*
* tzone.c - get the timezone
*
* This is shared by bootpd and bootpef
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/libexec/bootpd/tzone.c 68561 2000-11-10 12:19:53Z dirk $
*/
#ifdef SVR4
Modified: trunk/libexec/bootpd/tzone.h
===================================================================
--- trunk/libexec/bootpd/tzone.h 2018-07-07 01:02:31 UTC (rev 11402)
+++ trunk/libexec/bootpd/tzone.h 2018-07-07 01:04:36 UTC (rev 11403)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* tzone.h */
extern int32 secondswest;
extern void tzone_init();
More information about the Midnightbsd-cvs
mailing list