Add pfSense_BUILDER_BINARIES: and pfSense_MODULE: additions

42 files changed, 202 insertions, 23 deletions

diff --git a/etc/inc/IPv6.inc b/etc/inc/IPv6.inc
index 45ea2d7..f6c0c25 100644
--- a/etc/inc/IPv6.inc
+++ b/etc/inc/IPv6.inc
@@ -1,5 +1,9 @@
 <?php

 

+/*

+	pfSense_MODULE:	util

+*/

+

 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */

 

 /**

@@ -915,4 +919,4 @@ class Net_IPv6 {
  * End:

  */

 

-?>
+?>

diff --git a/etc/inc/PEAR.inc b/etc/inc/PEAR.inc
index 5f5c758..26d1159 100644
--- a/etc/inc/PEAR.inc
+++ b/etc/inc/PEAR.inc
@@ -1,5 +1,8 @@
 <?php
-// $Id$
+
+/*
+	pfSense_MODULE:	utils
+*/
 
 //
 // +--------------------------------------------------------------------+
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index 5f6d77c..413fb3e 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -35,6 +35,8 @@
         POSSIBILITY OF SUCH DAMAGE.
 
 		DISABLE_PHP_LINT_CHECKING
+		pfSense_BUILDER_BINARIES:	/usr/sbin/pw	/bin/cp
+		pfSense_MODULE:	auth
 */
 
 /*
diff --git a/etc/inc/authgui.inc b/etc/inc/authgui.inc
index d9611d2..59845c0 100644
--- a/etc/inc/authgui.inc
+++ b/etc/inc/authgui.inc
@@ -33,6 +33,8 @@
         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.
+
+		pfSense_MODULE: authgui
 */
 
 include_once("priv.inc");
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index e1547f6..feff57a 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -33,6 +33,11 @@
 	via returned RADIUS attributes. This page has been modified to delete any
 	added rules which may have been created by other per-user code (index.php, etc).
 	These changes are (c) 2004 Keycom PLC.
+	
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig	/sbin/ipfw	/sbin/sysctl	/sbin/kldunload
+	pfSense_BUILDER_BINARIES:	/usr/local/sbin/lighttpd	/usr/local/bin/minicron	/sbin/pfctl
+	pfSense_BUILDER_BINARIES:	/bin/hostname	/bin/cp	
+	pfSense_MODULE:	captiveportal
 */
 
 /* include all configuration functions */
@@ -1010,9 +1015,9 @@ function getVolume($ip) {
     $matchesout = "";
     exec("/sbin/ipfw table 3 entrystats {$ip}", $ipfwin);
     if ($ipfwin[0]) {
-	$ipfwin = split(" ", $ipfwin[0]);
-	$volume['input_pkts'] = $ipfwin[2];
-	$volume['input_bytes'] = $ipfwin[3];
+		$ipfwin = split(" ", $ipfwin[0]);
+		$volume['input_pkts'] = $ipfwin[2];
+		$volume['input_bytes'] = $ipfwin[3];
     }
 
     exec("/sbin/ipfw table 4 entrystats {$ip}", $ipfwout);
@@ -1089,4 +1094,4 @@ function portal_ip_from_client_ip($cliip) {
 	return false;
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/etc/inc/certs.inc b/etc/inc/certs.inc
index 03d789d..47bd3fe 100644
--- a/etc/inc/certs.inc
+++ b/etc/inc/certs.inc
@@ -26,6 +26,7 @@
         POSSIBILITY OF SUCH DAMAGE.
 
 		DISABLE_PHP_LINT_CHECKING
+		pfSense_MODULE:	certificate_managaer
 */
 
 require_once("functions.inc");
@@ -326,4 +327,4 @@ function cert_get_issuer($str_crt, $decode = true) {
 	return $issuer;
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/etc/inc/cmd_chain.inc b/etc/inc/cmd_chain.inc
index 13bd913..eb81954 100644
--- a/etc/inc/cmd_chain.inc
+++ b/etc/inc/cmd_chain.inc
@@ -26,6 +26,8 @@
 	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.
+
+	pfSense_MODULE:	utils
 */
 
 /* 
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index b0720e5..8d8ac49 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -36,6 +36,10 @@
 	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.
+
+
+	pfSense_BUILDER_BINARIES:	/sbin/mount	/sbin/sysctl	/sbin/umount	/sbin/halt	/sbin/fsck	/bin/sync
+	pfSense_MODULE:	config
 */
 /*
  * XXX: Hack around the cvs syntax checks. 
diff --git a/etc/inc/crypt.inc b/etc/inc/crypt.inc
index 8c56dca..e13b8ff 100644
--- a/etc/inc/crypt.inc
+++ b/etc/inc/crypt.inc
@@ -26,6 +26,9 @@
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 
+	pfSense_BUILDER_BINARIES:	/usr/bin/openssl
+	pfSense_MODULE:	crypto
+
     DISABLE_PHP_LINT_CHECKING
 */
 
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index f783255..c09399a 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -33,6 +33,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 
+	pfSense_BUILDER_BINARIES:	/sbin/sysctl	/sbin/kldload	/usr/sbin/tcpdump	/sbin/pfctl	/bin/rm
+	pfSense_BUILDER_BINARIES:	/usr/sbin/inetd	
+	pfSense_MODULE:	filter
 */
 /* DISABLE_PHP_LINT_CHECKING */
 
@@ -2286,4 +2289,4 @@ EOD;
 	return($ipfrules);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/etc/inc/functions.inc b/etc/inc/functions.inc
index b5e99b0..f2ee6e2 100644
--- a/etc/inc/functions.inc
+++ b/etc/inc/functions.inc
@@ -29,6 +29,9 @@
     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.
+
+	pfSense_MODULE:	utils
+
 */
 
 /* BEGIN compatibility goo with HEAD */
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc
index 2cc39c8..7e5e184 100644
--- a/etc/inc/globals.inc
+++ b/etc/inc/globals.inc
@@ -29,6 +29,9 @@
     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.
+
+	pfSense_MODULE:	utils
+
 */
 
 function remove_numbers($string) {
diff --git a/etc/inc/growl.class b/etc/inc/growl.class
index c0cf480..aa35533 100644
--- a/etc/inc/growl.class
+++ b/etc/inc/growl.class
@@ -1,4 +1,8 @@
 <?PHP
+/*
+	pfSense_MODULE:	notifications
+*/
+
     class Growl
     {
         const GROWL_PRIORITY_LOW = -2;
diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc
index 09db94a..f61c402 100644
--- a/etc/inc/gwlb.inc
+++ b/etc/inc/gwlb.inc
@@ -25,6 +25,9 @@
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE.
 
+	pfSense_BUILDER_BINARIES:	/usr/bin/killall	/sbin/route	/usr/local/sbin/apinger
+	pfSense_MODULE:	routing
+
   */
 
 /* add static routes for monitor IP addresse
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 9e6ffee..858b5a2 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -34,6 +34,11 @@
 	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.
+
+	pfSense_BUILDER_BINARIES:	/usr/sbin/pppd	/sbin/dhclient	/bin/sh	/usr/bin/grep	/usr/bin/xargs	/usr/bin/awk
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig	/sbin/route	/usr/sbin/ngctl	/usr/sbin/arp	/bin/kill	/usr/local/sbin/mpd4
+	pfSense_MODULE:	interfaces
+
 */
 
 /* include all configuration functions */
@@ -795,7 +800,7 @@ function interface_bring_down($interface = "wan", $destroy = false) {
         /* remove interface up file if it exists */
         unlink_if_exists("{$g['tmp_path']}/{$realif}up");
         unlink_if_exists("{$g['vardb_path']}/{$interface}ip");
-	unlink_if_exists("/tmp/{$realif}_router");
+		unlink_if_exists("/tmp/{$realif}_router");
         //unlink_if_exists("{$g['varetc_path']}/nameservers.conf");
 
 	switch ($ifcfg['ipaddr']) {
diff --git a/etc/inc/ipsec.inc b/etc/inc/ipsec.inc
index 30a4542..c55bfea 100644
--- a/etc/inc/ipsec.inc
+++ b/etc/inc/ipsec.inc
@@ -28,6 +28,10 @@
 	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.
+
+	pfSense_BUILDER_BINARIES:	/usr/local/sbin/setkey
+	pfSense_MODULE:	ipsec
+
 */
 
 /* IPsec defines */
diff --git a/etc/inc/itemid.inc b/etc/inc/itemid.inc
index 3a48e51..0c05c2e 100644
--- a/etc/inc/itemid.inc
+++ b/etc/inc/itemid.inc
@@ -1,5 +1,9 @@
 <?php
-/* $Id$ */
+
+/*
+	pfSense_MODULE:	util
+*/
+
 /*
 		Copyright (C) 2009 Janne Enberg <janne.enberg@lietu.net>
 		All rights reserved.
diff --git a/etc/inc/led.inc b/etc/inc/led.inc
index d29a381..3264eef 100644
--- a/etc/inc/led.inc
+++ b/etc/inc/led.inc
@@ -7,6 +7,10 @@
  * LED control library that wraps around the functionality of led(4)
  *
  */
+/*
+	pfSense_BUILDER_BINARIES:	/bin/echo
+	pfSense_MODULE:	util
+*/
 
 $led_root = "/dev/led/led";
 
diff --git a/etc/inc/meta.inc b/etc/inc/meta.inc
index 6b3d003..87f5a0b 100644
--- a/etc/inc/meta.inc
+++ b/etc/inc/meta.inc
@@ -23,6 +23,9 @@
 	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.
+
+	pfSense_MODULE:	util
+
 */
 
 /*
diff --git a/etc/inc/notices.inc b/etc/inc/notices.inc
index 42ddd45..d24909b 100644
--- a/etc/inc/notices.inc
+++ b/etc/inc/notices.inc
@@ -34,6 +34,11 @@
  *
  */
 
+/*
+	pfSense_BUILDER_BINARIES:	/bin/echo
+	pfSense_MODULE:	notifications
+*/
+
 require_once("globals.inc");
 require_once("led.inc");
 
diff --git a/etc/inc/openvpn.auth-user.php b/etc/inc/openvpn.auth-user.php
index 675677c..4d5871e 100755
--- a/etc/inc/openvpn.auth-user.php
+++ b/etc/inc/openvpn.auth-user.php
@@ -30,7 +30,10 @@
 
 	DISABLE_PHP_LINT_CHECKING
 */
-
+/*
+	pfSense_BUILDER_BINARIES:	
+	pfSense_MODULE:	openvpn
+*/
 /*
  * OpenVPN calls this script to authenticate a user
  * based on a username and password. We lookup these
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index 9270817..14286fa 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -39,9 +39,13 @@
 	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.
-*/
-/* DISABLE_PHP_LINT_CHECKING */
+	
+	DISABLE_PHP_LINT_CHECKING
+	
+	pfSense_BUILDER_BINARIES:	/usr/local/sbin/openvpn	/usr/bin/openssl	/sbin/ifconfig
+	pfSense_MODULE:	openvpn
 
+*/
 require_once('config.inc');
 require_once("certs.inc");
 require_once('pfsense-utils.inc');
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 0f182ee..dd8ae5c 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -33,6 +33,13 @@
  *
  */
 
+/*
+	pfSense_BUILDER_BINARIES:	/sbin/sysctl	/sbin/ifconfig	/sbin/pfctl	/usr/local/bin/php /usr/bin/netstat
+	pfSense_BUILDER_BINARIES:	/bin/df	/usr/bin/grep	/usr/bin/awk	/bin/rm	/usr/sbin/pwd_mkdb	/usr/bin/host
+	pfSense_BUILDER_BINARIES:	/sbin/kldload
+	pfSense_MODULE:	utils
+*/
+
 /****f* pfsense-utils/have_natonetooneruleint_access
  * NAME
  *   have_natonetooneruleint_access
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index 6938c85..c0c3c2c 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -32,6 +32,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
+/*
+	pfSense_BUILDER_BINARIES:	/usr/bin/cd	/usr/bin/tar	/bin/cat	/usr/sbin/fifolog_create	/bin/chmod
+	pfSense_BUILDER_BINARIES:	/usr/bin/killall	/usr/sbin/pkg_info	/usr/sbin/pkg_delete	/bin/rm	/bin/ls
+	pfSense_BUILDER_BINARIES:	/sbin/pfctl
+	pfSense_MODULE:	pkg
+*/
+
 require_once("xmlrpc.inc");
 require_once("xmlparse.inc");
 require_once("service-utils.inc");
@@ -1075,4 +1083,4 @@ function pkg_build_filter_rules() {
 		file_notice($error);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/etc/inc/priv.defs.inc b/etc/inc/priv.defs.inc
index 0c6749c..fadf09b 100644
--- a/etc/inc/priv.defs.inc
+++ b/etc/inc/priv.defs.inc
@@ -4,6 +4,11 @@
  *
  */
 
+/*
+	pfSense_BUILDER_BINARIES:	
+	pfSense_MODULE:	auth
+*/
+
 $priv_list = array();
 
 $priv_list['page-all'] = array();
@@ -1005,4 +1010,4 @@ $priv_list['page-openvpn-csc']['match'][] = "vpn_openvpn_csc.php*";
 
 $priv_rmvd = array();
 
-?>
+?>
\ No newline at end of file
diff --git a/etc/inc/priv.inc b/etc/inc/priv.inc
index 9b6c97c..03b2e8c 100644
--- a/etc/inc/priv.inc
+++ b/etc/inc/priv.inc
@@ -40,6 +40,10 @@
 		DISABLE_PHP_LINT_CHECKING
 */
 
+/*
+	pfSense_MODULE:	auth
+*/
+
 require_once("priv.defs.inc");
 require_once("auth.inc");
 
diff --git a/etc/inc/radius.inc b/etc/inc/radius.inc
index 90287ca..a5de307 100644
--- a/etc/inc/radius.inc
+++ b/etc/inc/radius.inc
@@ -46,6 +46,10 @@
 
 */
 
+/*
+	pfSense_MODULE:	auth
+*/
+
 require_once("PEAR.inc");
 require_once("radius_authentication.inc");
 require_once("radius_accounting.inc");
diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc
index 721316e..a915d53 100644
--- a/etc/inc/rrd.inc
+++ b/etc/inc/rrd.inc
@@ -27,6 +27,11 @@
 
   */
 
+/*
+	pfSense_BUILDER_BINARIES:	/bin/rm	/usr/bin/nice	/usr/local/bin/rrdtool	/bin/cd
+	pfSense_MODULE:	rrd
+*/
+
 /* include all configuration functions */
 require_once("config.inc");
 
diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc
index 6c10017..e4e1755 100644
--- a/etc/inc/service-utils.inc
+++ b/etc/inc/service-utils.inc
@@ -33,6 +33,11 @@
  *
  */
 
+/*
+	pfSense_BUILDER_BINARIES:	/usr/bin/killall	/bin/sh	/bin/ps	
+	pfSense_MODULE:	utils
+*/
+
 function write_rcfile($params) {
 	$fileprefix = "/usr/local/etc/rc.d/";
 	if(!(is_writable($fileprefix . $params['file']) or $params['start'])) return false;
@@ -188,4 +193,4 @@ function is_service_running($service, $ps = "") {
 	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index ce3d3c7..8034411 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -30,6 +30,14 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+/*
+	pfSense_BUILDER_BINARIES:	/usr/bin/killall	/bin/sh	/usr/local/sbin/dhcpd	/usr/local/sbin/igmpproxy
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig	/usr/sbin/arp	/sbin/ifconfig	/usr/local/sbin/dnsmasq
+	pfSense_BUILDER_BINARIES:	/usr/sbin/bsnmpd	/usr/local/sbin/choparp	/sbin/route	/usr/local/sbin/olsrd
+	pfSense_BUILDER_BINARIES:	/usr/local/sbin/miniupnpd	
+	pfSense_MODULE:	utils
+*/
+
 /* include all configuration functions */
 require_once("functions.inc");
 
@@ -1322,4 +1330,4 @@ function upnp_start() {
 	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index f73d3a5..3a31806 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -23,6 +23,9 @@
 		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.
+
+		pfSense_BUILDER_BINARIES:	/bin/kill	/sbin/kldload	/bin/rm	/bin/ps
+		pfSense_MODULE:	shaper
 */
 
 /* include all configuration functions */
diff --git a/etc/inc/smtp.inc b/etc/inc/smtp.inc
index 4338aa9..4f39682 100644
--- a/etc/inc/smtp.inc
+++ b/etc/inc/smtp.inc
@@ -6,6 +6,10 @@
  *
  */
 
+/*
+	pfSense_MODULE:	notifications
+*/
+
 class smtp_class
 {
 	var $user="";
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 53efbb8..711b171 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -29,6 +29,14 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+/*
+	pfSense_BUILDER_BINARIES:	/usr/sbin/powerd	/usr/bin/killall	/sbin/sysctl	/sbin/route
+	pfSense_BUILDER_BINARIES:	/bin/hostname	/bin/ls	/usr/bin/netstat	/usr/sbin/syslogd	
+	pfSense_BUILDER_BINARIES:	/usr/sbin/pccardd	/usr/local/sbin/lighttpd	/bin/chmod 	/bin/mkdir
+	pfSense_BUILDER_BINARIES:	/usr/bin/tar	/bin/sync	/usr/local/sbin/ntpd	/usr/sbin/ntpdate
+	pfSense_BUILDER_BINARIES:	/usr/bin/nohup	/sbin/dmesg	/usr/local/sbin/atareinit
+	pfSense_MODULE:	utils
+*/
 
 function activate_powerd() {
 	global $config, $g;
@@ -1095,7 +1103,7 @@ function system_halt() {
 
 	system_reboot_cleanup();
 
-	mwexec("nohup /etc/rc.halt > /dev/null 2>&1 &");
+	mwexec("/usr/bin/nohup /etc/rc.halt > /dev/null 2>&1 &");
 }
 
 function system_reboot() {
@@ -1278,4 +1286,4 @@ function enable_watchdog() {
 	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index cebb922..1414e44 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -29,6 +29,10 @@ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 	POSSIBILITY OF SUCH DAMAGE.
 	*/
 
+/*
+	pfSense_BUILDER_BINARIES:	/usr/bin/find	/bin/cd	/usr/local/bin/rrdtool	/usr/bin/nice
+	pfSense_MODULE:	config
+*/
 
 /* Upgrade functions must be named:
 *    upgrade_XXX_to_YYY
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 3a402e6..845f41c 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -29,6 +29,13 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+/*
+	pfSense_BUILDER_BINARIES:	/bin/ps	/bin/kill	/usr/bin/killall	/sbin/ifconfig	/usr/bin/netstat
+	pfSense_BUILDER_BINARIES:	/usr/bin/awk	/sbin/dmesg		/sbin/ping /usr/local/sbin/gzsig	/usr/sbin/arp
+	pfSense_BUILDER_BINARIES:	/sbin/conscontrol	/sbin/devd	/bin/ps
+	pfSense_MODULE:	utils
+*/
+
 /* kill a process by pid file */
 function killbypid($pidfile) {
 	sigkillbypid($pidfile, "TERM");
diff --git a/etc/inc/voucher.inc b/etc/inc/voucher.inc
index 3c4fbe8..fbc0ee3 100644
--- a/etc/inc/voucher.inc
+++ b/etc/inc/voucher.inc
@@ -25,7 +25,12 @@
     POSSIBILITY OF SUCH DAMAGE.
 
 */
-    
+
+/*
+	pfSense_BUILDER_BINARIES:	/usr/local/bin/voucher	/usr/local/bin/minicron
+	pfSense_MODULE:	captiveportal
+*/
+
 /* include all configuration functions */
 require_once("config.inc");
 
@@ -402,4 +407,4 @@ function voucher_save_db_to_config() {
     return;
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index fb7d303..a4c543c 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -33,6 +33,14 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+/*
+	pfSense_BUILDER_BINARIES:	/usr/bin/killall	/usr/local/sbin/sasyncd	/sbin/ifconfig	/sbin/sysctl
+	pfSense_BUILDER_BINARIES:	/usr/local/sbin/setkey	/usr/bin/netstat	/sbin/route	/bin/mkdir
+	pfSense_BUILDER_BINARIES:	/usr/local/sbin/racoonctl	/usr/local/sbin/racoon
+	pfSense_BUILDER_BINARIES:	/usr/local/sbin/dnswatch	/usr/local/sbin/mpd4	
+	pfSense_MODULE:	vpn
+*/
+
 /* include all configuration functions */
 require_once ("functions.inc");
 
@@ -831,7 +839,7 @@ EOD;
 			mkdir("/var/db/racoon/");
 		
 		exec("/bin/mkdir -p /var/db/racoon");
-		
+
 		/* mange racoon process */
 		if (is_process_running("racoon")) {
 			sleep("0.1");
diff --git a/etc/inc/vslb.inc b/etc/inc/vslb.inc
index dc53dcd..0613524 100644
--- a/etc/inc/vslb.inc
+++ b/etc/inc/vslb.inc
@@ -28,6 +28,11 @@
 
  */
 
+/*
+	pfSense_BUILDER_BINARIES:	/usr/local/sbin/relayd
+	pfSense_MODULE:	routing
+*/
+
 /* DISABLE_PHP_LINT_CHECKING */
 
 /* include all configuration functions */
@@ -265,4 +270,4 @@ function relayd_configure() {
   }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/etc/inc/xmlparse.inc b/etc/inc/xmlparse.inc
index 6b532a7..7627c4b 100644
--- a/etc/inc/xmlparse.inc
+++ b/etc/inc/xmlparse.inc
@@ -30,6 +30,10 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+/*
+	pfSense_MODULE:	utils
+*/
+
 /* The following items will be treated as arrays in config.xml */
 function listtags() {
   /* Please keep this list alpha sorted and no longer than 80 characters
diff --git a/etc/inc/xmlrpc.inc b/etc/inc/xmlrpc.inc
index 6ebbb79..61167bf 100644
--- a/etc/inc/xmlrpc.inc
+++ b/etc/inc/xmlrpc.inc
@@ -28,6 +28,11 @@
         POSSIBILITY OF SUCH DAMAGE.
 */
 
+/*
+	pfSense_BUILDER_BINARIES:	
+	pfSense_MODULE:	utils
+*/
+
 require_once("xmlrpc_client.inc");
 
 /*
diff --git a/etc/inc/xmlrpc_client.inc b/etc/inc/xmlrpc_client.inc
index cd03689..bac5e1f 100644
--- a/etc/inc/xmlrpc_client.inc
+++ b/etc/inc/xmlrpc_client.inc
@@ -36,6 +36,9 @@
  * @link       http://pear.php.net/package/XML_RPC
  */
 
+/*
+	pfSense_MODULE:	utils
+*/
 
 if (!function_exists('xml_parser_create')) {
     include_once 'PEAR.inc';
diff --git a/etc/inc/xmlrpc_server.inc b/etc/inc/xmlrpc_server.inc
index 43adb5e..8887bdf 100644
--- a/etc/inc/xmlrpc_server.inc
+++ b/etc/inc/xmlrpc_server.inc
@@ -36,6 +36,9 @@
  * @link       http://pear.php.net/package/XML_RPC
  */
 
+/*
+	pfSense_MODULE:	utils
+*/
 
 /**
  * Pull in the XML_RPC class