ports/141199: net/mpd5 doesn't build when world is build WITHOUT_IPFW

[Volodymyr Kostyrko]

>Number:         141199
>Category:       ports
>Synopsis:       net/mpd5 doesn't build when world is build WITHOUT_IPFW
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 05 21:20:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Volodymyr Kostyrko
>Release:        RELENG_8
>Organization:
>Environment:
FreeBSD orz.lan 8.0-STABLE FreeBSD 8.0-STABLE #0: Fri Dec  4 23:15:36 UTC 2009     root@:/mnt/obj/amd64/usr/src/sys/GENERIC  amd64
>Description:
There is a source bug which prevents compiling radius support when IPFW was disabled at build time.
>How-To-Repeat:
Build world WITHOUT_IPFW and remove all installed IPFW components. Port compilation fails like this:
cc -O2 -pipe -march=athlon64 -DNO_IDEA -fno-strict-aliasing -march=athlon64 -DPROTO_NAME_LIST -DUSE_WRAP -DUSE_OPIE -DUSE_PAM -DUSE_SYSTEM -DPATH_CONF_DIR=\"/usr/local/etc/mpd5\" -DSYSLOG_FACILITY=LOG_DAEMON -DMPD_VERSION='"5.3 (root at orz.lan 23:04  5-Dec-2009)"' -g -Wall  -Wcast-align  -Wchar-subscripts  -Wformat  -Winline  -Wmissing-declarations  -Wmissing-prototypes  -Wnested-externs  -Wpointer-arith  -Wwrite-strings  -pthread  -I/usr/local/include -DPHYSTYPE_MODEM -DPHYSTYPE_UDP -DPHYSTYPE_TCP -DPHYSTYPE_NG_SOCKET -DPHYSTYPE_PPTP -DRANDOMIZE_CID -DPHYSTYPE_PPPOE -DPHYSTYPE_L2TP -DCCP_DEFLATE -DUSE_NG_DEFLATE -DCCP_MPPC -DUSE_NG_MPPC -DCCP_PRED1 -DUSE_NG_PRED1 -DECP_DES -DUSE_NG_BPF -DUSE_NG_CAR -DUSE_NG_IPACCT -DUSE_NG_NAT -DUSE_NG_NETFLOW -DUSE_NG_TCPMSS -DUSE_NG_VJC -DUSE_IPFW -DUSE_FETCH -std=gnu99 -fstack-protector  -c radius.c
radius.c: In function 'RadiusGetParams':
radius.c:1793: error: 'acl1' undeclared (first use in this function)
radius.c:1793: error: (Each undeclared identifier is reported only once
radius.c:1793: error: for each function it appears in.)
radius.c:1793: error: 'acl' undeclared (first use in this function)
radius.c:1796: error: 'acl2' undeclared (first use in this function)
radius.c:1804: error: 'acls' undeclared (first use in this function)
radius.c:1851: error: 'acl3' undeclared (first use in this function)
radius.c:1867: error: 'acls1' undeclared (first use in this function)
*** Error code 1
>Fix:
The problems resides in radius.c, some lines before reported ones:

--- src/radius.c        2009-12-05 22:47:25.613341356 +0000
+++ src/radius.c    2009-12-05 22:47:37.516330144 +0000
@@ -1332,7 +1332,7 @@
   char         *route;
   char         *tmpval;
   struct in_addr       ip;
-#if defined(USE_NG_BPF) && defined(USE_IPFW)
+#if defined(USE_NG_BPF) || defined(USE_IPFW)
   struct acl           **acls, *acls1;
   char         *acl, *acl1, *acl2, *acl3;
 #endif

The mentioned variables was not defined if NG_BPF _or_ IPFW was absent. Changing the logic here fixes the code.

The patch works for me. Program compiles and runs.

>Release-Note:
>Audit-Trail:
>Unformatted: