[Midnightbsd-cvs] src [10353] sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 10353
          http://svnweb.midnightbsd.org/src/?rev=10353
Author:   laffer1
Date:     2018-06-03 18:56:56 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/usr.sbin/rarpd/rarpd.8
    trunk/usr.sbin/rarpd/rarpd.c

Property Changed:
----------------
    trunk/usr.sbin/rarpd/rarpd.8

Modified: trunk/usr.sbin/rarpd/rarpd.8
===================================================================
--- trunk/usr.sbin/rarpd/rarpd.8	2018-06-03 22:56:22 UTC (rev 10352)
+++ trunk/usr.sbin/rarpd/rarpd.8	2018-06-03 22:56:56 UTC (rev 10353)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1990, 1991, 1993 The Regents of the University of
 .\" California. All rights reserved.
 .\"
@@ -14,8 +15,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\" $FreeBSD: release/9.2.0/usr.sbin/rarpd/rarpd.8 245076 2013-01-05 22:55:08Z markj $
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/rarpd/rarpd.8 238300 2012-07-09 15:44:35Z joel $
 .\"
 .Dd July 9, 2012
 .Dt RARPD 8
@@ -97,7 +97,7 @@
 Run in the foreground.
 .It Fl P
 Specify the pathname of the PID file.
-If not specified, 
+If not specified,
 .Pa /var/run/rarpd.pid
 or
 .Pa /var/run/rarpd.ifname.pid


Property changes on: trunk/usr.sbin/rarpd/rarpd.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/rarpd/rarpd.c
===================================================================
--- trunk/usr.sbin/rarpd/rarpd.c	2018-06-03 22:56:22 UTC (rev 10352)
+++ trunk/usr.sbin/rarpd/rarpd.c	2018-06-03 22:56:56 UTC (rev 10353)
@@ -1,5 +1,5 @@
 /* $MidnightBSD$ */
-/*-
+/*
  * Copyright (c) 1990, 1991, 1992, 1993, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -23,7 +23,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/usr.sbin/rarpd/rarpd.c 251083 2013-05-28 23:43:11Z marius $");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/rarpd/rarpd.c 300472 2016-05-23 05:43:59Z truckman $");
 
 /*
  * rarpd - Reverse ARP Daemon
@@ -129,7 +129,7 @@
 main(int argc, char *argv[])
 {
 	int op;
-	char *ifname, *hostname, *name;
+	char *ifname, *name;
 
 	int aflag = 0;		/* listen on "all" interfaces  */
 	int fflag = 0;		/* don't fork */
@@ -187,7 +187,6 @@
 	argv += optind;
 
 	ifname = (aflag == 0) ? argv[0] : NULL;
-	hostname = ifname ? argv[1] : argv[0];
 	
 	if ((aflag && ifname) || (!aflag && ifname == NULL))
 		usage();
@@ -697,11 +696,10 @@
  * host (i.e. the guy running rarpd), won't try to ARP for the hardware
  * address of the guy being booted (he cannot answer the ARP).
  */
-static struct sockaddr_inarp sin_inarp = {
-	sizeof(struct sockaddr_inarp), AF_INET, 0,
+static struct sockaddr_in sin_inarp = {
+	sizeof(struct sockaddr_in), AF_INET, 0,
 	{0},
 	{0},
-	0, 0
 };
 
 static struct sockaddr_dl sin_dl = {
@@ -719,7 +717,7 @@
 {
 	struct timespec tp;
 	int cc;
-	struct sockaddr_inarp *ar, *ar2;
+	struct sockaddr_in *ar, *ar2;
 	struct sockaddr_dl *ll, *ll2;
 	struct rt_msghdr *rt;
 	int xtype, xindex;
@@ -742,12 +740,12 @@
 
 	/* Get the type and interface index */
 	rt = &rtmsg.rthdr;
-	bzero(rt, sizeof(rtmsg));
+	bzero(&rtmsg, sizeof(rtmsg));
 	rt->rtm_version = RTM_VERSION;
 	rt->rtm_addrs = RTA_DST;
 	rt->rtm_type = RTM_GET;
 	rt->rtm_seq = ++seq;
-	ar2 = (struct sockaddr_inarp *)rtmsg.rtspace;
+	ar2 = (struct sockaddr_in *)rtmsg.rtspace;
 	bcopy(ar, ar2, sizeof(*ar));
 	rt->rtm_msglen = sizeof(*rt) + sizeof(*ar);
 	errno = 0;