bin/44512: ftp-proxy doesn't compile with MKIPFILTER=no

[pallegra%gmail.com@localhost]

>Number:         44512
>Category:       bin
>Synopsis:       ftp-proxy doesn't compile with MKIPFILTER=no
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bin-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Feb 04 12:00:00 +0000 2011
>Originator:     Pierre Allegraud
>Release:        CURRENT
>Organization:
>Environment:
>Description:
With MKNPF=yes and MKIPFILTER=no options, 
/usr/src/dist/pf/usr.sbin/ftp-proxy/ftp-proxy.c doesn't compile.
./dist/pf/usr.sbin/ftp-proxy/filter.h declares npfopts iff MKIPFILTER=yes, but 
this variable is also used by npf.
>How-To-Repeat:
Add MKIPFILTER=no into /etc/mk.conf and rebuild ftp-proxy.
>Fix:
This quick n dirty patch fixes this problem :

Index: ./dist/pf/usr.sbin/ftp-proxy/filter.h
===================================================================
RCS file: /cvsroot/src/dist/pf/usr.sbin/ftp-proxy/filter.h,v
retrieving revision 1.3
diff -u -r1.3 filter.h
--- ./dist/pf/usr.sbin/ftp-proxy/filter.h       2 Feb 2011 02:20:26 -0000       
1.3
+++ ./dist/pf/usr.sbin/ftp-proxy/filter.h       4 Feb 2011 11:57:24 -0000
@@ -43,6 +43,9 @@
 
 #if defined(__NetBSD__) && defined(WITH_IPF)
 extern const ftp_proxy_ops_t   ipf_fprx_ops;
+#endif
+
+#if defined(__NetBSD__) && (defined(WITH_NPF) || defined(WITH_IPF))
 extern char *                  npfopts;
 #endif