[src/netbsd-1-5]: src/sys/netinet Pull up revisions 1.38-1.39 (requested by v...

[veego <veego%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/858b0a00bebe
branches:  netbsd-1-5
changeset: 489328:858b0a00bebe
user:      veego <veego%NetBSD.org@localhost>
date:      Thu Aug 31 14:55:00 2000 +0000

description:
Pull up revisions 1.38-1.39 (requested by veego). Approved by releng-1-5.

>syssrc/sys/netinet/fil.c       1.38
>Committed By:  veego
>Log Message:
>Protect a IPLLOG with ifdef IPFILTER_LOG. Patch from Darren Reed.

>syssrc/sys/netinet/fil.c       1.39
>Committed By:  enami
>Log Message:
>Put # endif directive after the right (i.e., matching) close brace
>to prevent compilation error.

diffstat:

 sys/netinet/fil.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r bcbba3fe169d -r 858b0a00bebe sys/netinet/fil.c
--- a/sys/netinet/fil.c Thu Aug 31 14:53:44 2000 +0000
+++ b/sys/netinet/fil.c Thu Aug 31 14:55:00 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fil.c,v 1.36.2.1 2000/08/31 14:49:49 veego Exp $       */
+/*     $NetBSD: fil.c,v 1.36.2.2 2000/08/31 14:55:00 veego Exp $       */
 
 /*
  * Copyright (C) 1993-2000 by Darren Reed.
@@ -9,7 +9,7 @@
  */
 #if !defined(lint)
 #if defined(__NetBSD__)
-static const char rcsid[] = "$NetBSD: fil.c,v 1.36.2.1 2000/08/31 14:49:49 veego Exp $";
+static const char rcsid[] = "$NetBSD: fil.c,v 1.36.2.2 2000/08/31 14:55:00 veego Exp $";
 #else
 static const char sccsid[] = "@(#)fil.c        1.36 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: fil.c,v 2.35.2.19 2000/07/27 13:08:18 darrenr Exp";
@@ -848,6 +848,7 @@
                ATOMIC_INCL(frstats[0].fr_ipv6[out]);
        } else
 # endif
+# ifdef        IPFILTER_LOG
                if (!out && fr_chksrc && !fr_verifysrc(ip->ip_src, ifp)) {
                        ATOMIC_INCL(frstats[0].fr_badsrc);
                        if (fr_chksrc == 2) {
@@ -860,6 +861,7 @@
 # endif
                        return error;
                }
+# endif
 #endif
        pass = fr_pass;
        if (fin->fin_fi.fi_fl & FI_SHORT) {