As we parse the interface list, ignore sockaddr_dl's that

don't have an interface index that's the same as the if_msghdr
interface index.

This prevents the occasional perror("SIOCGIFFLAGS") from appearing
at boot time.

While I'm there:
  Make a couple of error messages more useful.
  Add a missing include.
  Add some braces to silence gccs dumb complaints.
  Add some consts
  Ansify decls
  Add copyright to pmap_check.h (well, you could say it's been rewritten)

1 files changed, 36 insertions, 7 deletions

diff --git a/usr.sbin/portmap/pmap_check.h b/usr.sbin/portmap/pmap_check.h
index 2c240df..c5927a4 100644
--- a/usr.sbin/portmap/pmap_check.h
+++ b/usr.sbin/portmap/pmap_check.h
@@ -1,11 +1,40 @@
-/* @(#) pmap_check.h 1.3 93/11/21 16:18:53 */
+/*-
+ * Copyright (c) 2000 Brian Somers <brian@Awfulhak.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#) pmap_check.h 1.3 93/11/21 16:18:53
+ *
+ * $FreeBSD$
+ */
+
+extern int from_local(struct sockaddr_in *);
+extern void check_startup(void);
+extern int check_default(struct sockaddr_in *, u_long, u_long);
+extern int check_setunset(struct sockaddr_in *, u_long, u_long, u_long);
+extern int check_privileged_port(struct sockaddr_in *, u_long, u_long, u_long);
+extern int check_callit(struct sockaddr_in *, u_long, u_long, u_long);
 
-extern int from_local();
-extern void check_startup();
-extern int check_default();
-extern int check_setunset();
-extern int check_privileged_port();
-extern int check_callit();
 extern int verboselog;
 extern int allow_severity;
 extern int deny_severity;