From 6aa3723a90a1946660ce9499aefb02250693b60e Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 15 Dec 2015 15:57:29 -0200 Subject: Remove all pfSense_MODULE and pfSense_BUILDER_BINARIES definitions, whatever was the reason they were added, it was never finished and it's not being used --- src/etc/inc/IPv6.inc | 4 ---- src/etc/inc/authgui.inc | 3 --- src/etc/inc/captiveportal.inc | 5 ----- src/etc/inc/certs.inc | 2 -- src/etc/inc/config.console.inc | 4 ---- src/etc/inc/config.gui.inc | 4 ---- src/etc/inc/config.inc | 4 ---- src/etc/inc/config.lib.inc | 4 ---- src/etc/inc/crypt.inc | 4 ---- src/etc/inc/easyrule.inc | 4 ---- src/etc/inc/filter.inc | 4 ---- src/etc/inc/filter_log.inc | 4 ---- src/etc/inc/functions.inc | 3 --- src/etc/inc/globals.inc | 3 --- src/etc/inc/growl.class | 6 +----- src/etc/inc/gwlb.inc | 4 +--- src/etc/inc/interfaces.inc | 6 ------ src/etc/inc/ipsec.auth-user.php | 4 ---- src/etc/inc/ipsec.inc | 4 ---- src/etc/inc/itemid.inc | 6 +----- src/etc/inc/led.inc | 6 +----- src/etc/inc/meta.inc | 3 --- src/etc/inc/notices.inc | 5 ----- src/etc/inc/openvpn.auth-user.php | 4 ---- src/etc/inc/openvpn.inc | 6 +----- src/etc/inc/openvpn.tls-verify.php | 4 ---- src/etc/inc/pfsense-utils.inc | 7 ------- src/etc/inc/pkg-utils.inc | 3 --- src/etc/inc/priv.inc | 4 ---- src/etc/inc/radius.inc | 4 ---- src/etc/inc/rrd.inc | 5 ----- src/etc/inc/service-utils.inc | 4 ---- src/etc/inc/services.inc | 8 -------- src/etc/inc/smtp.inc | 4 ---- src/etc/inc/system.inc | 10 ---------- src/etc/inc/unbound.inc | 4 ---- src/etc/inc/upgrade_config.inc | 4 ---- src/etc/inc/util.inc | 6 ------ src/etc/inc/voucher.inc | 5 ----- src/etc/inc/vpn.inc | 7 ------- src/etc/inc/vslb.inc | 6 ------ src/etc/inc/xmlreader.inc | 4 ---- src/etc/inc/xmlrpc.inc | 5 ----- src/usr/local/bin/filterparser.php | 3 --- src/usr/local/captiveportal/index.php | 3 --- src/usr/local/captiveportal/radius_accounting.inc | 4 ---- src/usr/local/captiveportal/radius_authentication.inc | 4 ---- src/usr/local/sbin/gmirror_status_check.php | 6 ------ src/usr/local/sbin/ppp-ipv6 | 2 -- src/usr/local/www/bandwidth_by_ip.php | 5 ----- src/usr/local/www/crash_reporter.php | 3 --- src/usr/local/www/diag_arp.php | 5 ----- src/usr/local/www/diag_authentication.php | 4 ---- src/usr/local/www/diag_backup.php | 5 ----- src/usr/local/www/diag_confbak.php | 4 ---- src/usr/local/www/diag_defaults.php | 4 ---- src/usr/local/www/diag_dns.php | 3 --- src/usr/local/www/diag_dump_states.php | 4 ---- src/usr/local/www/diag_dump_states_sources.php | 5 ----- src/usr/local/www/diag_gmirror.php | 6 ------ src/usr/local/www/diag_halt.php | 3 --- src/usr/local/www/diag_limiter_info.php | 5 ----- src/usr/local/www/diag_nanobsd.php | 6 ------ src/usr/local/www/diag_ndp.php | 5 ----- src/usr/local/www/diag_packet_capture.php | 5 ----- src/usr/local/www/diag_pf_info.php | 5 ----- src/usr/local/www/diag_pftop.php | 4 ---- src/usr/local/www/diag_ping.php | 5 ----- src/usr/local/www/diag_resetstate.php | 4 ---- src/usr/local/www/diag_routes.php | 4 ---- src/usr/local/www/diag_sockets.php | 3 --- src/usr/local/www/diag_states_summary.php | 5 ----- src/usr/local/www/diag_system_activity.php | 5 ----- src/usr/local/www/diag_tables.php | 4 ---- src/usr/local/www/diag_testport.php | 5 ----- src/usr/local/www/diag_traceroute.php | 5 ----- src/usr/local/www/easyrule.php | 3 --- src/usr/local/www/edit.php | 3 --- src/usr/local/www/exec.php | 3 --- src/usr/local/www/filebrowser/browser.js | 4 ---- src/usr/local/www/filebrowser/browser.php | 1 - src/usr/local/www/firewall_aliases.php | 3 --- src/usr/local/www/firewall_aliases_edit.php | 4 ---- src/usr/local/www/firewall_aliases_import.php | 3 --- src/usr/local/www/firewall_nat.php | 3 --- src/usr/local/www/firewall_nat_1to1.php | 3 --- src/usr/local/www/firewall_nat_1to1_edit.php | 3 --- src/usr/local/www/firewall_nat_edit.php | 3 --- src/usr/local/www/firewall_nat_npt.php | 3 --- src/usr/local/www/firewall_nat_npt_edit.php | 3 --- src/usr/local/www/firewall_nat_out.php | 3 --- src/usr/local/www/firewall_nat_out_edit.php | 3 --- src/usr/local/www/firewall_rules.php | 3 --- src/usr/local/www/firewall_rules_edit.php | 3 --- src/usr/local/www/firewall_schedule.php | 4 +--- src/usr/local/www/firewall_schedule_edit.php | 3 --- src/usr/local/www/firewall_shaper.php | 4 ---- src/usr/local/www/firewall_shaper_queues.php | 4 ---- src/usr/local/www/firewall_shaper_vinterface.php | 4 ---- src/usr/local/www/firewall_shaper_wizards.php | 4 ---- src/usr/local/www/firewall_virtual_ip.php | 4 ---- src/usr/local/www/firewall_virtual_ip_edit.php | 4 ---- src/usr/local/www/foot.inc | 3 --- src/usr/local/www/getserviceproviders.php | 3 --- src/usr/local/www/getstats.php | 3 --- src/usr/local/www/graph.php | 3 --- src/usr/local/www/graph_cpu.php | 3 --- src/usr/local/www/guiconfig.inc | 3 --- src/usr/local/www/head.inc | 3 --- src/usr/local/www/ifstats.php | 3 --- src/usr/local/www/includes/functions.inc.php | 1 - src/usr/local/www/index.php | 4 ---- src/usr/local/www/interfaces.php | 4 ---- src/usr/local/www/interfaces_assign.php | 4 ---- src/usr/local/www/interfaces_bridge.php | 4 ---- src/usr/local/www/interfaces_bridge_edit.php | 3 --- src/usr/local/www/interfaces_gif.php | 4 ---- src/usr/local/www/interfaces_gif_edit.php | 3 --- src/usr/local/www/interfaces_gre.php | 4 ---- src/usr/local/www/interfaces_gre_edit.php | 3 --- src/usr/local/www/interfaces_groups.php | 4 ---- src/usr/local/www/interfaces_groups_edit.php | 4 ---- src/usr/local/www/interfaces_lagg.php | 4 ---- src/usr/local/www/interfaces_lagg_edit.php | 3 --- src/usr/local/www/interfaces_ppps.php | 4 ---- src/usr/local/www/interfaces_ppps_edit.php | 3 --- src/usr/local/www/interfaces_qinq.php | 4 ---- src/usr/local/www/interfaces_qinq_edit.php | 4 ---- src/usr/local/www/interfaces_vlan.php | 4 ---- src/usr/local/www/interfaces_vlan_edit.php | 3 --- src/usr/local/www/interfaces_wireless.php | 3 --- src/usr/local/www/interfaces_wireless_edit.php | 3 --- src/usr/local/www/license.php | 3 --- src/usr/local/www/load_balancer_monitor.php | 3 --- src/usr/local/www/load_balancer_monitor_edit.php | 3 --- src/usr/local/www/load_balancer_pool.php | 3 --- src/usr/local/www/load_balancer_pool_edit.php | 3 --- src/usr/local/www/load_balancer_setting.php | 3 --- src/usr/local/www/load_balancer_virtual_server.php | 3 --- src/usr/local/www/load_balancer_virtual_server_edit.php | 3 --- src/usr/local/www/pkg.php | 3 --- src/usr/local/www/pkg_edit.php | 4 ---- src/usr/local/www/pkg_mgr.php | 4 ---- src/usr/local/www/pkg_mgr_install.php | 4 ---- src/usr/local/www/pkg_mgr_installed.php | 3 --- src/usr/local/www/restart_httpd.php | 4 ---- src/usr/local/www/services_captiveportal.php | 3 --- src/usr/local/www/services_captiveportal_filemanager.php | 3 --- src/usr/local/www/services_captiveportal_hostname.php | 4 ---- src/usr/local/www/services_captiveportal_hostname_edit.php | 4 ---- src/usr/local/www/services_captiveportal_ip.php | 4 ---- src/usr/local/www/services_captiveportal_ip_edit.php | 4 ---- src/usr/local/www/services_captiveportal_mac.php | 3 --- src/usr/local/www/services_captiveportal_mac_edit.php | 3 --- src/usr/local/www/services_captiveportal_vouchers.php | 4 ---- src/usr/local/www/services_captiveportal_vouchers_edit.php | 3 --- src/usr/local/www/services_captiveportal_zones_edit.php | 3 --- src/usr/local/www/services_dhcp.php | 4 ---- src/usr/local/www/services_dhcp_edit.php | 4 ---- src/usr/local/www/services_dhcp_relay.php | 3 --- src/usr/local/www/services_dhcpv6.php | 4 ---- src/usr/local/www/services_dhcpv6_edit.php | 4 ---- src/usr/local/www/services_dhcpv6_relay.php | 3 --- src/usr/local/www/services_dnsmasq.php | 3 --- src/usr/local/www/services_dnsmasq_domainoverride_edit.php | 3 --- src/usr/local/www/services_dnsmasq_edit.php | 3 --- src/usr/local/www/services_dyndns.php | 4 ---- src/usr/local/www/services_dyndns_edit.php | 4 ---- src/usr/local/www/services_igmpproxy.php | 3 --- src/usr/local/www/services_igmpproxy_edit.php | 3 --- src/usr/local/www/services_ntpd.php | 3 --- src/usr/local/www/services_ntpd_gps.php | 3 --- src/usr/local/www/services_ntpd_pps.php | 3 --- src/usr/local/www/services_pppoe.php | 3 --- src/usr/local/www/services_rfc2136.php | 3 --- src/usr/local/www/services_rfc2136_edit.php | 3 --- src/usr/local/www/services_router_advertisements.php | 4 ---- src/usr/local/www/services_snmp.php | 3 --- src/usr/local/www/services_unbound.php | 3 --- src/usr/local/www/services_unbound_advanced.php | 3 --- src/usr/local/www/services_unbound_domainoverride_edit.php | 3 --- src/usr/local/www/services_unbound_host_edit.php | 3 --- src/usr/local/www/services_wol.php | 4 ---- src/usr/local/www/services_wol_edit.php | 3 --- src/usr/local/www/shortcuts.inc | 3 --- src/usr/local/www/status.php | 5 ----- src/usr/local/www/status_captiveportal.php | 3 --- src/usr/local/www/status_captiveportal_expire.php | 3 --- src/usr/local/www/status_captiveportal_test.php | 3 --- src/usr/local/www/status_captiveportal_voucher_rolls.php | 3 --- src/usr/local/www/status_captiveportal_vouchers.php | 3 --- src/usr/local/www/status_carp.php | 4 ---- src/usr/local/www/status_dhcp_leases.php | 4 ---- src/usr/local/www/status_dhcpv6_leases.php | 5 ----- src/usr/local/www/status_filter_reload.php | 3 --- src/usr/local/www/status_gateway_groups.php | 3 --- src/usr/local/www/status_gateways.php | 3 --- src/usr/local/www/status_graph.php | 3 --- src/usr/local/www/status_graph_cpu.php | 3 --- src/usr/local/www/status_interfaces.php | 3 --- src/usr/local/www/status_ipsec.php | 4 ---- src/usr/local/www/status_ipsec_leases.php | 5 ----- src/usr/local/www/status_ipsec_sad.php | 5 ----- src/usr/local/www/status_ipsec_spd.php | 5 ----- src/usr/local/www/status_lb_pool.php | 3 --- src/usr/local/www/status_lb_vs.php | 4 ---- src/usr/local/www/status_logs.php | 4 ---- src/usr/local/www/status_logs_filter.php | 4 ---- src/usr/local/www/status_logs_filter_dynamic.php | 4 ---- src/usr/local/www/status_logs_filter_summary.php | 5 ----- src/usr/local/www/status_logs_settings.php | 4 ---- src/usr/local/www/status_logs_vpn.php | 5 ----- src/usr/local/www/status_ntpd.php | 4 ---- src/usr/local/www/status_openvpn.php | 3 --- src/usr/local/www/status_pkglogs.php | 4 ---- src/usr/local/www/status_queues.php | 4 ---- src/usr/local/www/status_rrd_graph.php | 3 --- src/usr/local/www/status_rrd_graph_img.php | 4 ---- src/usr/local/www/status_rrd_graph_settings.php | 4 ---- src/usr/local/www/status_services.php | 4 ---- src/usr/local/www/status_upnp.php | 4 ---- src/usr/local/www/status_wireless.php | 3 --- src/usr/local/www/system.php | 4 ---- src/usr/local/www/system_advanced_admin.php | 4 ---- src/usr/local/www/system_advanced_firewall.php | 3 --- src/usr/local/www/system_advanced_misc.php | 3 --- src/usr/local/www/system_advanced_network.php | 3 --- src/usr/local/www/system_advanced_notifications.php | 3 --- src/usr/local/www/system_advanced_sysctl.php | 3 --- src/usr/local/www/system_authservers.php | 3 --- src/usr/local/www/system_camanager.php | 3 --- src/usr/local/www/system_certmanager.php | 3 --- src/usr/local/www/system_crlmanager.php | 3 --- src/usr/local/www/system_gateway_groups.php | 3 --- src/usr/local/www/system_gateway_groups_edit.php | 3 --- src/usr/local/www/system_gateways.php | 3 --- src/usr/local/www/system_gateways_edit.php | 3 --- src/usr/local/www/system_groupmanager.php | 3 --- src/usr/local/www/system_groupmanager_addprivs.php | 3 --- src/usr/local/www/system_hasync.php | 3 --- src/usr/local/www/system_routes.php | 3 --- src/usr/local/www/system_routes_edit.php | 3 --- src/usr/local/www/system_update_settings.php | 4 ---- src/usr/local/www/system_usermanager.php | 4 ---- src/usr/local/www/system_usermanager_addprivs.php | 3 --- src/usr/local/www/system_usermanager_passwordmg.php | 4 ---- src/usr/local/www/system_usermanager_settings.php | 3 --- src/usr/local/www/system_usermanager_settings_ldapacpicker.php | 3 --- src/usr/local/www/system_usermanager_settings_test.php | 3 --- src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php | 4 ---- src/usr/local/www/wizards/openvpn_wizard.inc | 2 -- 251 files changed, 6 insertions(+), 931 deletions(-) (limited to 'src') diff --git a/src/etc/inc/IPv6.inc b/src/etc/inc/IPv6.inc index faacb8d..bfc8124 100644 --- a/src/etc/inc/IPv6.inc +++ b/src/etc/inc/IPv6.inc @@ -1,9 +1,5 @@ diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc index 0f1d166..daec9b5 100644 --- a/src/etc/inc/captiveportal.inc +++ b/src/etc/inc/captiveportal.inc @@ -35,11 +35,6 @@ 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/ipfw /sbin/route - 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 */ diff --git a/src/etc/inc/certs.inc b/src/etc/inc/certs.inc index 9c36228..6d260e6 100644 --- a/src/etc/inc/certs.inc +++ b/src/etc/inc/certs.inc @@ -25,8 +25,6 @@ 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: certificate_manager */ define("OPEN_SSL_CONF_PATH", "/etc/ssl/openssl.cnf"); diff --git a/src/etc/inc/config.console.inc b/src/etc/inc/config.console.inc index f719591..ce9dfd2 100644 --- a/src/etc/inc/config.console.inc +++ b/src/etc/inc/config.console.inc @@ -36,10 +36,6 @@ 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/umount /sbin/halt /sbin/fsck - pfSense_MODULE: config */ function set_networking_interfaces_ports() { diff --git a/src/etc/inc/config.gui.inc b/src/etc/inc/config.gui.inc index 175a811..0883ede 100644 --- a/src/etc/inc/config.gui.inc +++ b/src/etc/inc/config.gui.inc @@ -36,10 +36,6 @@ 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/umount /sbin/halt /sbin/fsck - pfSense_MODULE: config */ require_once("globals.inc"); diff --git a/src/etc/inc/config.inc b/src/etc/inc/config.inc index 4c07213..5f038fa 100644 --- a/src/etc/inc/config.inc +++ b/src/etc/inc/config.inc @@ -36,10 +36,6 @@ 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/umount /sbin/halt /sbin/fsck - pfSense_MODULE: config */ if (!function_exists('platform_booting')) { diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc index 9eef685..62763b0 100644 --- a/src/etc/inc/config.lib.inc +++ b/src/etc/inc/config.lib.inc @@ -37,10 +37,6 @@ 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/umount /sbin/halt - pfSense_MODULE: config */ /****f* config/encrypted_configxml diff --git a/src/etc/inc/crypt.inc b/src/etc/inc/crypt.inc index 2710dd3..f621588 100644 --- a/src/etc/inc/crypt.inc +++ b/src/etc/inc/crypt.inc @@ -25,10 +25,6 @@ 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/bin/openssl - pfSense_MODULE: crypto - */ function crypt_data($val, $pass, $opt) { diff --git a/src/etc/inc/easyrule.inc b/src/etc/inc/easyrule.inc index 727fd4b..e91c8a5 100644 --- a/src/etc/inc/easyrule.inc +++ b/src/etc/inc/easyrule.inc @@ -27,10 +27,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: - pfSense_MODULE: filter -*/ $blockaliasname = 'EasyRuleBlockHosts'; $protocols_with_ports = array('tcp', 'udp'); diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc index 2d4c6a5..e2f016c 100644 --- a/src/etc/inc/filter.inc +++ b/src/etc/inc/filter.inc @@ -31,10 +31,6 @@ 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/kldload /usr/sbin/tcpdump /sbin/pfctl /bin/rm - pfSense_BUILDER_BINARIES: /usr/sbin/inetd - pfSense_MODULE: filter */ diff --git a/src/etc/inc/filter_log.inc b/src/etc/inc/filter_log.inc index 62c2780..6226ba2 100644 --- a/src/etc/inc/filter_log.inc +++ b/src/etc/inc/filter_log.inc @@ -52,10 +52,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /usr/sbin/fifolog_reader /usr/bin/tail /usr/local/sbin/clog - pfSense_MODULE: filter -*/ require 'config.inc'; diff --git a/src/etc/inc/functions.inc b/src/etc/inc/functions.inc index b95dec4..1edd6a3 100644 --- a/src/etc/inc/functions.inc +++ b/src/etc/inc/functions.inc @@ -28,9 +28,6 @@ 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/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 915b1bd..56ad540 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -1,7 +1,4 @@ \ No newline at end of file +?> diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc index ab2d5a6..6ef69a4 100644 --- a/src/etc/inc/gwlb.inc +++ b/src/etc/inc/gwlb.inc @@ -25,10 +25,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: routing - */ + require_once("config.inc"); require_once("rrd.inc"); diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 984913b..8b6643b 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -33,12 +33,6 @@ 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/dhclient /bin/sh /usr/bin/grep /usr/bin/xargs /usr/bin/awk /usr/local/sbin/choparp - pfSense_BUILDER_BINARIES: /sbin/ifconfig /sbin/route /usr/sbin/ngctl /usr/sbin/arp /bin/kill /usr/local/sbin/mpd5 - pfSense_BUILDER_BINARIES: /usr/local/sbin/dhcp6c - pfSense_MODULE: interfaces - */ /* include all configuration functions */ diff --git a/src/etc/inc/ipsec.auth-user.php b/src/etc/inc/ipsec.auth-user.php index 99e62ce..a504d11 100755 --- a/src/etc/inc/ipsec.auth-user.php +++ b/src/etc/inc/ipsec.auth-user.php @@ -31,10 +31,6 @@ */ /* - pfSense_BUILDER_BINARIES: - pfSense_MODULE: openvpn -*/ -/* * ipsec calls this script to authenticate a user * based on a username and password. We lookup these * in our config.xml file and check the credentials. diff --git a/src/etc/inc/ipsec.inc b/src/etc/inc/ipsec.inc index e766ae1..b1e8c19 100644 --- a/src/etc/inc/ipsec.inc +++ b/src/etc/inc/ipsec.inc @@ -28,10 +28,6 @@ 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/setkey /sbin/route - pfSense_MODULE: ipsec - */ /* IPsec defines */ diff --git a/src/etc/inc/itemid.inc b/src/etc/inc/itemid.inc index c698cfa..1cbe34a 100644 --- a/src/etc/inc/itemid.inc +++ b/src/etc/inc/itemid.inc @@ -1,10 +1,6 @@ All rights reserved. @@ -105,4 +101,4 @@ function get_unique_id() { return uniqid("nat_", true); } -?> \ No newline at end of file +?> diff --git a/src/etc/inc/led.inc b/src/etc/inc/led.inc index a08eef4..241d013 100644 --- a/src/etc/inc/led.inc +++ b/src/etc/inc/led.inc @@ -7,10 +7,6 @@ * LED control library that wraps around the functionality of led(4) * */ -/* - pfSense_BUILDER_BINARIES: /bin/echo - pfSense_MODULE: utils -*/ $led_root = "/dev/led/led"; @@ -353,4 +349,4 @@ function char_to_morse($char) { } } -?> \ No newline at end of file +?> diff --git a/src/etc/inc/meta.inc b/src/etc/inc/meta.inc index ac8bdfc..28bf408 100644 --- a/src/etc/inc/meta.inc +++ b/src/etc/inc/meta.inc @@ -23,9 +23,6 @@ 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/src/etc/inc/notices.inc b/src/etc/inc/notices.inc index 0a1657c..92f74a1 100644 --- a/src/etc/inc/notices.inc +++ b/src/etc/inc/notices.inc @@ -32,11 +32,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /bin/echo - pfSense_MODULE: notifications -*/ - require_once("globals.inc"); require_once("led.inc"); diff --git a/src/etc/inc/openvpn.auth-user.php b/src/etc/inc/openvpn.auth-user.php index d258135..a95051d 100644 --- a/src/etc/inc/openvpn.auth-user.php +++ b/src/etc/inc/openvpn.auth-user.php @@ -31,10 +31,6 @@ */ /* - pfSense_BUILDER_BINARIES: - pfSense_MODULE: openvpn -*/ -/* * OpenVPN calls this script to authenticate a user * based on a username and password. We lookup these * in our config.xml file and check the credentials. diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc index 9dc5579..da666e3 100644 --- a/src/etc/inc/openvpn.inc +++ b/src/etc/inc/openvpn.inc @@ -37,12 +37,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_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/src/etc/inc/openvpn.tls-verify.php b/src/etc/inc/openvpn.tls-verify.php index c23eb5d..ea17207 100644 --- a/src/etc/inc/openvpn.tls-verify.php +++ b/src/etc/inc/openvpn.tls-verify.php @@ -30,10 +30,6 @@ */ /* - pfSense_BUILDER_BINARIES: - pfSense_MODULE: openvpn -*/ -/* * OpenVPN calls this script to validate a certificate * This script is called ONCE per DEPTH of the certificate chain * Normal operation would have two runs - one for the server certificate diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index c5c5de5..41b5c7d 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -31,13 +31,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /sbin/ifconfig /sbin/pfctl /usr/local/bin/php-cgi - 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_natpfruleint_access * NAME * have_natpfruleint_access diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc index 0303092..1509206 100644 --- a/src/etc/inc/pkg-utils.inc +++ b/src/etc/inc/pkg-utils.inc @@ -53,9 +53,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: pkg -*/ require_once("globals.inc"); require_once("service-utils.inc"); diff --git a/src/etc/inc/priv.inc b/src/etc/inc/priv.inc index 0d51085..676351b 100644 --- a/src/etc/inc/priv.inc +++ b/src/etc/inc/priv.inc @@ -39,10 +39,6 @@ */ -/* - pfSense_MODULE: auth -*/ - require_once("priv.defs.inc"); /* Load and process custom privs. */ diff --git a/src/etc/inc/radius.inc b/src/etc/inc/radius.inc index ac610bd..a63b831 100644 --- a/src/etc/inc/radius.inc +++ b/src/etc/inc/radius.inc @@ -47,10 +47,6 @@ */ -/* - pfSense_MODULE: auth -*/ - require_once("PEAR.inc"); require_once("radius_authentication.inc"); require_once("radius_accounting.inc"); diff --git a/src/etc/inc/rrd.inc b/src/etc/inc/rrd.inc index d80c6d4..11bab43 100644 --- a/src/etc/inc/rrd.inc +++ b/src/etc/inc/rrd.inc @@ -28,11 +28,6 @@ */ -/* - pfSense_BUILDER_BINARIES: /bin/rm /usr/bin/nice /usr/local/bin/rrdtool /bin/cd - pfSense_MODULE: rrd -*/ - /* include all configuration functions */ function dump_rrd_to_xml($rrddatabase, $xmldumpfile) { diff --git a/src/etc/inc/service-utils.inc b/src/etc/inc/service-utils.inc index f4d355d..55ad503 100644 --- a/src/etc/inc/service-utils.inc +++ b/src/etc/inc/service-utils.inc @@ -32,10 +32,6 @@ */ -/* - pfSense_BUILDER_BINARIES: /bin/pgrep /bin/sh /usr/bin/killall - pfSense_MODULE: utils -*/ require_once("globals.inc"); require_once("captiveportal.inc"); require_once("openvpn.inc"); diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index da9a28e..0a1d56a 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -30,14 +30,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/killall /bin/pgrep /bin/sh /usr/local/sbin/dhcpd /usr/local/sbin/igmpproxy - pfSense_BUILDER_BINARIES: /sbin/ifconfig /usr/local/sbin/dnsmasq - pfSense_BUILDER_BINARIES: /usr/local/sbin/miniupnpd /usr/sbin/radvd - pfSense_BUILDER_BINARIES: /usr/local/sbin/dhcleases6 /usr/sbin/bsnmpd - pfSense_MODULE: utils -*/ - define('DYNDNS_PROVIDER_VALUES', 'citynetwork cloudflare custom custom-v6 dnsexit dnsimple dnsmadeeasy dnsomatic dyndns dyndns-custom dyndns-static dyns easydns eurodns freedns glesys googledomains gratisdns he-net he-net-v6 he-net-tunnelbroker loopia namecheap noip noip-free ods opendns ovh-dynhost route53 selfhost spdns spdns-v6 zoneedit'); define('DYNDNS_PROVIDER_DESCRIPTIONS', 'City Network,CloudFlare,Custom,Custom (v6),DNSexit,DNSimple,DNS Made Easy,DNS-O-Matic,DynDNS (dynamic),DynDNS (custom),DynDNS (static),DyNS,easyDNS,Euro Dns,freeDNS,GleSYS,Google Domains,GratisDNS,HE.net,HE.net (v6),HE.net Tunnelbroker,Loopia,Namecheap,No-IP,No-IP (free),ODS.org,OpenDNS,OVH DynHOST,Route 53,SelfHost,SPDNS,SPDNS (v6),ZoneEdit'); diff --git a/src/etc/inc/smtp.inc b/src/etc/inc/smtp.inc index 035a30a..9a70e90 100644 --- a/src/etc/inc/smtp.inc +++ b/src/etc/inc/smtp.inc @@ -6,10 +6,6 @@ * */ -/* - pfSense_MODULE: notifications -*/ - class smtp_class { var $user=""; diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index 9cbc534..01189c9 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -28,16 +28,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /usr/sbin/powerd /usr/bin/killall /sbin/route - pfSense_BUILDER_BINARIES: /bin/hostname /bin/ls /usr/sbin/syslogd - pfSense_BUILDER_BINARIES: /usr/sbin/pccardd /usr/local/sbin/lighttpd /bin/chmod /bin/mkdir - pfSense_BUILDER_BINARIES: /usr/bin/tar /usr/local/sbin/ntpd /usr/local/sbin/ntpdate - pfSense_BUILDER_BINARIES: /usr/bin/nohup /sbin/dmesg /usr/local/sbin/atareinit /sbin/kldload - pfSense_BUILDER_BINARIES: /usr/local/sbin/filterdns - pfSense_MODULE: utils -*/ - function activate_powerd() { global $config, $g; diff --git a/src/etc/inc/unbound.inc b/src/etc/inc/unbound.inc index 35613e8..ccae458 100644 --- a/src/etc/inc/unbound.inc +++ b/src/etc/inc/unbound.inc @@ -25,10 +25,6 @@ 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/unbound /usr/local/sbin/unbound-anchor /usr/local/sbin/unbound-checkconf - pfSense_BUILDER_BINARIES: /usr/local/sbin/unbound-control /usr/local/sbin/unbound-control-setup - pfSense_MODULE: unbound */ /* include all configuration functions */ diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index a7bb6ce..05088a9 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -52,10 +52,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/find /bin/cd /usr/local/bin/rrdtool /usr/bin/nice - pfSense_MODULE: config -*/ if (!function_exists("dump_rrd_to_xml")) { require("rrd.inc"); diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index 8a9590a..875f1ee 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -55,12 +55,6 @@ * ==================================================================== * */ -/* - 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/sbin/arp - pfSense_BUILDER_BINARIES: /sbin/conscontrol /sbin/devd /bin/ps - pfSense_MODULE: utils -*/ /* kill a process by pid file */ function killbypid($pidfile) { diff --git a/src/etc/inc/voucher.inc b/src/etc/inc/voucher.inc index 97b2403..31078e2 100644 --- a/src/etc/inc/voucher.inc +++ b/src/etc/inc/voucher.inc @@ -29,11 +29,6 @@ */ -/* - pfSense_BUILDER_BINARIES: /usr/local/bin/voucher - pfSense_MODULE: captiveportal -*/ - /* include all configuration functions */ if (!function_exists('captiveportal_syslog')) { require_once("captiveportal.inc"); diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc index 8769ca1..50f0b01 100644 --- a/src/etc/inc/vpn.inc +++ b/src/etc/inc/vpn.inc @@ -32,13 +32,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /sbin/ifconfig - pfSense_BUILDER_BINARIES: /usr/local/sbin/ipsec /usr/local/libexec/ipsec/charon /usr/local/libexec/ipsec/starter - pfSense_BUILDER_BINARIES: /usr/local/sbin/filterdns /usr/local/sbin/mpd4 - pfSense_MODULE: vpn -*/ - require_once("ipsec.inc"); require_once("filter.inc"); diff --git a/src/etc/inc/vslb.inc b/src/etc/inc/vslb.inc index 1c509a9..cb2c50b 100644 --- a/src/etc/inc/vslb.inc +++ b/src/etc/inc/vslb.inc @@ -27,12 +27,6 @@ */ -/* - pfSense_BUILDER_BINARIES: /usr/local/sbin/relayd - pfSense_MODULE: routing -*/ - - /* include all configuration functions */ class Monitor { diff --git a/src/etc/inc/xmlreader.inc b/src/etc/inc/xmlreader.inc index 99034fc..3982c60 100644 --- a/src/etc/inc/xmlreader.inc +++ b/src/etc/inc/xmlreader.inc @@ -29,10 +29,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: utils -*/ - /* The following items will be treated as arrays in config.xml */ function listtags() { /* diff --git a/src/etc/inc/xmlrpc.inc b/src/etc/inc/xmlrpc.inc index 3658063..001777c 100644 --- a/src/etc/inc/xmlrpc.inc +++ b/src/etc/inc/xmlrpc.inc @@ -26,11 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: - pfSense_MODULE: utils -*/ - require_once("auth.inc"); require_once("xmlrpc_client.inc"); diff --git a/src/usr/local/bin/filterparser.php b/src/usr/local/bin/filterparser.php index 25faa90..0fb76bf 100755 --- a/src/usr/local/bin/filterparser.php +++ b/src/usr/local/bin/filterparser.php @@ -35,9 +35,6 @@ clog /var/log/filter.log | tail -50 | /usr/local/www/filterparser.php clog -f /var/log/filter.log | /usr/local/www/filterparser.php */ -/* - pfSense_MODULE: logs -*/ include_once("functions.inc"); include_once("filter_log.inc"); diff --git a/src/usr/local/captiveportal/index.php b/src/usr/local/captiveportal/index.php index 6e6de39..93c4e30 100644 --- a/src/usr/local/captiveportal/index.php +++ b/src/usr/local/captiveportal/index.php @@ -28,9 +28,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: captiveportal -*/ require_once("auth.inc"); require_once("functions.inc"); diff --git a/src/usr/local/captiveportal/radius_accounting.inc b/src/usr/local/captiveportal/radius_accounting.inc index 1b74378..ab11cb2 100644 --- a/src/usr/local/captiveportal/radius_accounting.inc +++ b/src/usr/local/captiveportal/radius_accounting.inc @@ -35,10 +35,6 @@ */ -/* - pfSense_MODULE: captiveportal -*/ - define('GIGAWORDS_RIGHT_OPERAND', '4294967296'); // 2^32 /* diff --git a/src/usr/local/captiveportal/radius_authentication.inc b/src/usr/local/captiveportal/radius_authentication.inc index 7a2ad90..ce14225 100644 --- a/src/usr/local/captiveportal/radius_authentication.inc +++ b/src/usr/local/captiveportal/radius_authentication.inc @@ -36,10 +36,6 @@ */ /* - pfSense_MODULE: captiveportal -*/ - -/* RADIUS AUTHENTICATION --------------------- */ diff --git a/src/usr/local/sbin/gmirror_status_check.php b/src/usr/local/sbin/gmirror_status_check.php index f19a5d1..b6cceb6 100644 --- a/src/usr/local/sbin/gmirror_status_check.php +++ b/src/usr/local/sbin/gmirror_status_check.php @@ -27,12 +27,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /sbin/gmirror /sbin/geom /usr/bin/grep /usr/bin/egrep /usr/bin/cut /usr/bin/head - pfSense_BUILDER_BINARIES: /sbin/mount /usr/bin/awk /usr/bin/sed - pfSense_MODULE: gmirror -*/ - require_once("config.inc"); require_once("notices.inc"); require_once("globals.inc"); diff --git a/src/usr/local/sbin/ppp-ipv6 b/src/usr/local/sbin/ppp-ipv6 index a05a4c2..aa0536c 100755 --- a/src/usr/local/sbin/ppp-ipv6 +++ b/src/usr/local/sbin/ppp-ipv6 @@ -5,8 +5,6 @@ PPP IPv6 helper - pfSense_BUILDER_BINARIES: /sbin/ifconfig /usr/local/sbin/dhcp6c - */ require_once("globals.inc"); diff --git a/src/usr/local/www/bandwidth_by_ip.php b/src/usr/local/www/bandwidth_by_ip.php index 39f9a01..92dc673 100755 --- a/src/usr/local/www/bandwidth_by_ip.php +++ b/src/usr/local/www/bandwidth_by_ip.php @@ -3,11 +3,6 @@ bandwidth_by_ip.php */ -/* - pfSense_BUILDER_BINARIES: /usr/local/bin/rate - pfSense_MODULE: trafficgraph -*/ - require_once('guiconfig.inc'); require_once('interfaces.inc'); require_once('pfsense-utils.inc'); diff --git a/src/usr/local/www/crash_reporter.php b/src/usr/local/www/crash_reporter.php index 01c1b71..2c9ffc1 100644 --- a/src/usr/local/www/crash_reporter.php +++ b/src/usr/local/www/crash_reporter.php @@ -52,9 +52,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: header -*/ ##|+PRIV ##|*IDENT=page-diagnostics-crash-reporter diff --git a/src/usr/local/www/diag_arp.php b/src/usr/local/www/diag_arp.php index ad58a70..d456be9 100644 --- a/src/usr/local/www/diag_arp.php +++ b/src/usr/local/www/diag_arp.php @@ -56,11 +56,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /bin/cat /usr/sbin/arp - pfSense_MODULE: arp -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-arptable ##|*NAME=Diagnostics: ARP Table diff --git a/src/usr/local/www/diag_authentication.php b/src/usr/local/www/diag_authentication.php index d665fc6..55b784e 100644 --- a/src/usr/local/www/diag_authentication.php +++ b/src/usr/local/www/diag_authentication.php @@ -53,10 +53,6 @@ * */ -/* - pfSense_MODULE: auth -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-authentication ##|*NAME=Diagnostics: Authentication diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index 4b5f453..3aaff07 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -56,11 +56,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /sbin/shutdown - pfSense_MODULE: backup -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-backup/restore ##|*NAME=Diagnostics: Backup/restore diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php index e91c629..5b817bc 100644 --- a/src/usr/local/www/diag_confbak.php +++ b/src/usr/local/www/diag_confbak.php @@ -54,10 +54,6 @@ * */ -/* - pfSense_MODULE: config -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-configurationhistory ##|*NAME=Diagnostics: Configuration History diff --git a/src/usr/local/www/diag_defaults.php b/src/usr/local/www/diag_defaults.php index e6fcadf..e13c17a 100755 --- a/src/usr/local/www/diag_defaults.php +++ b/src/usr/local/www/diag_defaults.php @@ -56,10 +56,6 @@ * */ -/* - pfSense_MODULE: config -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-factorydefaults ##|*NAME=Diagnostics: Factory defaults diff --git a/src/usr/local/www/diag_dns.php b/src/usr/local/www/diag_dns.php index 1ac0d17..d413def 100755 --- a/src/usr/local/www/diag_dns.php +++ b/src/usr/local/www/diag_dns.php @@ -52,9 +52,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: dns -*/ ##|+PRIV ##|*IDENT=page-diagnostics-dns diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php index f5cd437..13777d4 100755 --- a/src/usr/local/www/diag_dump_states.php +++ b/src/usr/local/www/diag_dump_states.php @@ -53,10 +53,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /sbin/pfctl - pfSense_MODULE: filter -*/ ##|+PRIV ##|*IDENT=page-diagnostics-showstates diff --git a/src/usr/local/www/diag_dump_states_sources.php b/src/usr/local/www/diag_dump_states_sources.php index da8cb35..5621f9a 100644 --- a/src/usr/local/www/diag_dump_states_sources.php +++ b/src/usr/local/www/diag_dump_states_sources.php @@ -54,11 +54,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /sbin/pfctl - pfSense_MODULE: filter -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-sourcetracking ##|*NAME=Diagnostics: Show Source Tracking diff --git a/src/usr/local/www/diag_gmirror.php b/src/usr/local/www/diag_gmirror.php index 8ec57cb..3dffd29 100644 --- a/src/usr/local/www/diag_gmirror.php +++ b/src/usr/local/www/diag_gmirror.php @@ -53,12 +53,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /sbin/gmirror /sbin/geom /usr/bin/grep /usr/bin/egrep /usr/bin/cut /usr/bin/head - pfSense_BUILDER_BINARIES: /sbin/mount /usr/bin/awk /usr/bin/sed - pfSense_MODULE: gmirror -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-gmirror ##|*NAME=Diagnostics: GEOM Mirrors diff --git a/src/usr/local/www/diag_halt.php b/src/usr/local/www/diag_halt.php index 20658e1..ba8a601 100755 --- a/src/usr/local/www/diag_halt.php +++ b/src/usr/local/www/diag_halt.php @@ -55,9 +55,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: header -*/ ##|+PRIV ##|*IDENT=page-diagnostics-haltsystem diff --git a/src/usr/local/www/diag_limiter_info.php b/src/usr/local/www/diag_limiter_info.php index 0c703b6..4eebab3 100644 --- a/src/usr/local/www/diag_limiter_info.php +++ b/src/usr/local/www/diag_limiter_info.php @@ -53,11 +53,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/top - pfSense_MODULE: system -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-limiter-info ##|*NAME=Diagnostics: Limiter Info diff --git a/src/usr/local/www/diag_nanobsd.php b/src/usr/local/www/diag_nanobsd.php index 7a06ebd..f2847d0 100644 --- a/src/usr/local/www/diag_nanobsd.php +++ b/src/usr/local/www/diag_nanobsd.php @@ -53,12 +53,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /sbin/mount /sbin/glabel /usr/bin/grep /usr/bin/cut /usr/bin/head /bin/cp - pfSense_BUILDER_BINARIES: /usr/sbin/boot0cfg /bin/mkdir /sbin/fsck_ufs /sbin/mount /bin/dd /sbin/tunefs - pfSense_MODULE: nanobsd -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-nanobsd ##|*NAME=Diagnostics: NanoBSD diff --git a/src/usr/local/www/diag_ndp.php b/src/usr/local/www/diag_ndp.php index f87b43f..b542552 100644 --- a/src/usr/local/www/diag_ndp.php +++ b/src/usr/local/www/diag_ndp.php @@ -57,11 +57,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /bin/cat /usr/sbin/arp - pfSense_MODULE: arp -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-ndptable ##|*NAME=Diagnostics: NDP Table diff --git a/src/usr/local/www/diag_packet_capture.php b/src/usr/local/www/diag_packet_capture.php index 6016e90..5258f9b 100644 --- a/src/usr/local/www/diag_packet_capture.php +++ b/src/usr/local/www/diag_packet_capture.php @@ -53,11 +53,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /bin/ps /usr/bin/grep /usr/sbin/tcpdump - pfSense_MODULE: routing -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-packetcapture ##|*NAME=Diagnostics: Packet Capture diff --git a/src/usr/local/www/diag_pf_info.php b/src/usr/local/www/diag_pf_info.php index bd0d3f0..27a78ae 100644 --- a/src/usr/local/www/diag_pf_info.php +++ b/src/usr/local/www/diag_pf_info.php @@ -53,11 +53,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/top - pfSense_MODULE: system -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-pf-info ##|*NAME=Diagnostics: pfInfo diff --git a/src/usr/local/www/diag_pftop.php b/src/usr/local/www/diag_pftop.php index dd57e9c..2225a16 100644 --- a/src/usr/local/www/diag_pftop.php +++ b/src/usr/local/www/diag_pftop.php @@ -53,10 +53,6 @@ * */ -/* - pfSense_MODULE: filter -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-system-pftop ##|*NAME=Diagnostics: pfTop diff --git a/src/usr/local/www/diag_ping.php b/src/usr/local/www/diag_ping.php index cc5c442..d95fc54 100644 --- a/src/usr/local/www/diag_ping.php +++ b/src/usr/local/www/diag_ping.php @@ -57,11 +57,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /sbin/ping /sbin/ping6 - pfSense_MODULE: routing -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-ping ##|*NAME=Diagnostics: Ping diff --git a/src/usr/local/www/diag_resetstate.php b/src/usr/local/www/diag_resetstate.php index a5edd4d..e492550 100644 --- a/src/usr/local/www/diag_resetstate.php +++ b/src/usr/local/www/diag_resetstate.php @@ -56,10 +56,6 @@ * */ -/* - pfSense_MODULE: filter -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-resetstate ##|*NAME=Diagnostics: Reset states diff --git a/src/usr/local/www/diag_routes.php b/src/usr/local/www/diag_routes.php index e02bafa..36048e1 100644 --- a/src/usr/local/www/diag_routes.php +++ b/src/usr/local/www/diag_routes.php @@ -53,10 +53,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/netstat - pfSense_MODULE: routing -*/ ##|+PRIV ##|*IDENT=page-diagnostics-routingtables ##|*NAME=Diagnostics: Routing tables diff --git a/src/usr/local/www/diag_sockets.php b/src/usr/local/www/diag_sockets.php index 5cad1ac..578934f 100644 --- a/src/usr/local/www/diag_sockets.php +++ b/src/usr/local/www/diag_sockets.php @@ -53,9 +53,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/sockstat -*/ ##|+PRIV ##|*IDENT=page-diagnostics-sockets ##|*NAME=Diagnostics: Sockets diff --git a/src/usr/local/www/diag_states_summary.php b/src/usr/local/www/diag_states_summary.php index ef6b612..06745a0 100644 --- a/src/usr/local/www/diag_states_summary.php +++ b/src/usr/local/www/diag_states_summary.php @@ -54,11 +54,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /sbin/pfctl - pfSense_MODULE: filter -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-statessummary ##|*NAME=Diagnostics: States Summary diff --git a/src/usr/local/www/diag_system_activity.php b/src/usr/local/www/diag_system_activity.php index 76c5c17..2442b5f 100644 --- a/src/usr/local/www/diag_system_activity.php +++ b/src/usr/local/www/diag_system_activity.php @@ -53,11 +53,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/top - pfSense_MODULE: system -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-system-activity ##|*NAME=Diagnostics: System Activity diff --git a/src/usr/local/www/diag_tables.php b/src/usr/local/www/diag_tables.php index c351701..36b41f7 100644 --- a/src/usr/local/www/diag_tables.php +++ b/src/usr/local/www/diag_tables.php @@ -53,10 +53,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /sbin/pfctl - pfSense_MODULE: filter -*/ ##|+PRIV ##|*IDENT=page-diagnostics-tables diff --git a/src/usr/local/www/diag_testport.php b/src/usr/local/www/diag_testport.php index 3b495e3..63e55c9 100644 --- a/src/usr/local/www/diag_testport.php +++ b/src/usr/local/www/diag_testport.php @@ -56,11 +56,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/nc - pfSense_MODULE: routing -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-testport ##|*NAME=Diagnostics: Test Port diff --git a/src/usr/local/www/diag_traceroute.php b/src/usr/local/www/diag_traceroute.php index 10a6a4b..ee76c0c 100644 --- a/src/usr/local/www/diag_traceroute.php +++ b/src/usr/local/www/diag_traceroute.php @@ -57,11 +57,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /usr/sbin/traceroute - pfSense_MODULE: routing -*/ - ##|+PRIV ##|*IDENT=page-diagnostics-traceroute ##|*NAME=Diagnostics: Traceroute diff --git a/src/usr/local/www/easyrule.php b/src/usr/local/www/easyrule.php index 575ddf8..0c28335 100644 --- a/src/usr/local/www/easyrule.php +++ b/src/usr/local/www/easyrule.php @@ -53,9 +53,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: filter -*/ ##|+PRIV ##|*IDENT=page-firewall-easyrule diff --git a/src/usr/local/www/edit.php b/src/usr/local/www/edit.php index 29e073b..ada73d1 100644 --- a/src/usr/local/www/edit.php +++ b/src/usr/local/www/edit.php @@ -52,9 +52,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: shell -*/ ##|+PRIV ##|*IDENT=page-diagnostics-edit diff --git a/src/usr/local/www/exec.php b/src/usr/local/www/exec.php index a36053c..30a51cd 100644 --- a/src/usr/local/www/exec.php +++ b/src/usr/local/www/exec.php @@ -59,9 +59,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: shell -*/ ##|+PRIV ##|*IDENT=page-diagnostics-command diff --git a/src/usr/local/www/filebrowser/browser.js b/src/usr/local/www/filebrowser/browser.js index 2769db3..54e07ee 100644 --- a/src/usr/local/www/filebrowser/browser.js +++ b/src/usr/local/www/filebrowser/browser.js @@ -1,7 +1,3 @@ -/* - pfSense_MODULE: shell -*/ - jQuery(document).ready( function() { jQuery("#fbOpen").click( diff --git a/src/usr/local/www/filebrowser/browser.php b/src/usr/local/www/filebrowser/browser.php index 8ab05db..fcbed78 100644 --- a/src/usr/local/www/filebrowser/browser.php +++ b/src/usr/local/www/filebrowser/browser.php @@ -3,7 +3,6 @@ require_once("guiconfig.inc"); /* - pfSense_MODULE: shell Copyright (C) 2013-2015 Electric Sheep Fencing, LP */ diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php index 6df3ad2..c93e94e 100644 --- a/src/usr/local/www/firewall_aliases.php +++ b/src/usr/local/www/firewall_aliases.php @@ -55,9 +55,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: aliases -*/ ##|+PRIV ##|*IDENT=page-firewall-aliases diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index 0adc184..6a23610 100755 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -55,10 +55,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /bin/rm /bin/mkdir /usr/bin/fetch - pfSense_MODULE: aliases -*/ ##|+PRIV ##|*IDENT=page-firewall-alias-edit diff --git a/src/usr/local/www/firewall_aliases_import.php b/src/usr/local/www/firewall_aliases_import.php index a263208..7260412 100755 --- a/src/usr/local/www/firewall_aliases_import.php +++ b/src/usr/local/www/firewall_aliases_import.php @@ -52,9 +52,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: filter -*/ ##|+PRIV ##|*IDENT=page-firewall-alias-import diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php index 6c856a5..8887d2f 100644 --- a/src/usr/local/www/firewall_nat.php +++ b/src/usr/local/www/firewall_nat.php @@ -55,9 +55,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: nat -*/ ##|+PRIV ##|*IDENT=page-firewall-nat-portforward diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php index 0995cb8..a9dded2 100644 --- a/src/usr/local/www/firewall_nat_1to1.php +++ b/src/usr/local/www/firewall_nat_1to1.php @@ -55,9 +55,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: nat -*/ ##|+PRIV ##|*IDENT=page-firewall-nat-1-1 diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php index 4b4d960..20c7bb6 100644 --- a/src/usr/local/www/firewall_nat_1to1_edit.php +++ b/src/usr/local/www/firewall_nat_1to1_edit.php @@ -55,9 +55,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: nat -*/ ##|+PRIV ##|*IDENT=page-firewall-nat-1-1-edit diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index fa2842e..b2fa1a2 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -55,9 +55,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: nat -*/ ##|+PRIV ##|*IDENT=page-firewall-nat-portforward-edit diff --git a/src/usr/local/www/firewall_nat_npt.php b/src/usr/local/www/firewall_nat_npt.php index 54e64ff..3c3f441 100644 --- a/src/usr/local/www/firewall_nat_npt.php +++ b/src/usr/local/www/firewall_nat_npt.php @@ -56,9 +56,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: nat -*/ ##|+PRIV ##|*IDENT=page-firewall-nat-npt diff --git a/src/usr/local/www/firewall_nat_npt_edit.php b/src/usr/local/www/firewall_nat_npt_edit.php index 9a783bb..6adbbcf 100644 --- a/src/usr/local/www/firewall_nat_npt_edit.php +++ b/src/usr/local/www/firewall_nat_npt_edit.php @@ -53,9 +53,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: nat -*/ ##|+PRIV ##|*IDENT=page-firewall-nat-npt-edit diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php index 1679be2..5b51d2d 100644 --- a/src/usr/local/www/firewall_nat_out.php +++ b/src/usr/local/www/firewall_nat_out.php @@ -55,9 +55,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: nat -*/ ##|+PRIV ##|*IDENT=page-firewall-nat-outbound diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php index 0f10140..fa25291 100644 --- a/src/usr/local/www/firewall_nat_out_edit.php +++ b/src/usr/local/www/firewall_nat_out_edit.php @@ -55,9 +55,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: nat -*/ ##|+PRIV ##|*IDENT=page-firewall-nat-outbound-edit diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index 4f7469b..127896b 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -55,9 +55,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: filter -*/ ##|+PRIV ##|*IDENT=page-firewall-rules diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 32d6342..00a0b39 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -55,9 +55,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: filter -*/ ##|+PRIV ##|*IDENT=page-firewall-rules-edit diff --git a/src/usr/local/www/firewall_schedule.php b/src/usr/local/www/firewall_schedule.php index 11bf2bb..c057b0a 100644 --- a/src/usr/local/www/firewall_schedule.php +++ b/src/usr/local/www/firewall_schedule.php @@ -55,9 +55,7 @@ * ==================================================================== * */ -/* - pfSense_MODULE: schedules -*/ + ##|+PRIV ##|*IDENT=page-firewall-schedules ##|*NAME=Firewall: Schedules diff --git a/src/usr/local/www/firewall_schedule_edit.php b/src/usr/local/www/firewall_schedule_edit.php index 14cab5a..c40f4fc 100644 --- a/src/usr/local/www/firewall_schedule_edit.php +++ b/src/usr/local/www/firewall_schedule_edit.php @@ -55,9 +55,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: schedules -*/ ##|+PRIV ##|*IDENT=page-firewall-schedules-edit diff --git a/src/usr/local/www/firewall_shaper.php b/src/usr/local/www/firewall_shaper.php index 1a9b9a9..94eeba2 100644 --- a/src/usr/local/www/firewall_shaper.php +++ b/src/usr/local/www/firewall_shaper.php @@ -52,10 +52,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/killall - pfSense_MODULE: shaper -*/ ##|+PRIV ##|*IDENT=page-firewall-trafficshaper diff --git a/src/usr/local/www/firewall_shaper_queues.php b/src/usr/local/www/firewall_shaper_queues.php index 0e67215..6b2f888 100644 --- a/src/usr/local/www/firewall_shaper_queues.php +++ b/src/usr/local/www/firewall_shaper_queues.php @@ -52,10 +52,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/killall - pfSense_MODULE: shaper -*/ ##|+PRIV ##|*IDENT=page-firewall-trafficshaper-queues diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php index 753f0e5..cf37663 100644 --- a/src/usr/local/www/firewall_shaper_vinterface.php +++ b/src/usr/local/www/firewall_shaper_vinterface.php @@ -52,10 +52,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/killall - pfSense_MODULE: shaper -*/ ##|+PRIV ##|*IDENT=page-firewall-trafficshaper-limiter diff --git a/src/usr/local/www/firewall_shaper_wizards.php b/src/usr/local/www/firewall_shaper_wizards.php index 4246201..1d93e00 100644 --- a/src/usr/local/www/firewall_shaper_wizards.php +++ b/src/usr/local/www/firewall_shaper_wizards.php @@ -52,10 +52,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/killall - pfSense_MODULE: shaper -*/ ##|+PRIV ##|*IDENT=page-firewall-trafficshaper-wizard diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php index 45fb083..59ac887 100644 --- a/src/usr/local/www/firewall_virtual_ip.php +++ b/src/usr/local/www/firewall_virtual_ip.php @@ -56,10 +56,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /sbin/ifconfig - pfSense_MODULE: interfaces -*/ ##|+PRIV ##|*IDENT=page-firewall-virtualipaddresses diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php index 9d30ce7..0e379bc 100644 --- a/src/usr/local/www/firewall_virtual_ip_edit.php +++ b/src/usr/local/www/firewall_virtual_ip_edit.php @@ -56,10 +56,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /sbin/ifconfig - pfSense_MODULE: interfaces -*/ ##|+PRIV ##|*IDENT=page-firewall-virtualipaddress-edit diff --git a/src/usr/local/www/foot.inc b/src/usr/local/www/foot.inc index 38c744f..4f73507 100755 --- a/src/usr/local/www/foot.inc +++ b/src/usr/local/www/foot.inc @@ -1,6 +1,3 @@ -