d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflicts from 2.4.3 merge

Browse Source
This commit is contained in:
Paul Traina 1996-01-23 01:58:00 +00:00
parent e08ac58bbe
commit d1c0e75921
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=13575
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libexec/bootpd/.indent.pro vendored
View File

@ -1,3 +0,0 @@
-nbad -nbap -nbbb -nbc -br -bli4 -c33 -cd33 -cdb -ce -ci4
-cli0 -cp1 -d0 -di0 -nfc1 -nfca -i4 -ip4 -l75 -lp -npcs
-psl -sc -nsob -nss -ts4

4
libexec/bootpd/Makefile
View File

@ -1,11 +1,11 @@
# bootpd/Makefile
# $Id: Makefile,v 1.2 1995/05/30 05:45:45 rgrimes Exp $
# $Id: Makefile,v 1.3 1995/07/25 23:38:40 wpaul Exp $
PROG= bootpd
CFLAGS+= -DETC_ETHERS
CFLAGS+= -DSYSLOG -DDEBUG -DVEND_CMU
SUBDIR= tools
SUBDIR= bootpgw tools
SRCS= bootpd.c dovend.c readfile.c hash.c dumptab.c \
lookup.c getif.c hwaddr.c report.c tzone.c rtmsg.c

2
libexec/bootpd/bootpd.c
View File

@ -1258,7 +1258,7 @@ dovend_rfc1048(bp, hp, bootsize)
byte *p, *ep;
byte tag, len;
short msgsz = 0;
p = vp + 4;
ep = p + BP_VEND_LEN - 4;
while (p < ep) {

2
libexec/bootpd/getether.c
View File

@ -106,7 +106,7 @@ getether(ifname, eap)
#endif /* SUNOS */
#if defined(__386BSD__) || defined(__NetBSD__)
#if defined(__FreeBSD__) || defined(__NetBSD__)
/* Thanks to John Brezak <brezak@ch.hp.com> for this code. */
#include <sys/ioctl.h>
#include <net/if.h>