From 93ef487f308ff24ff57988d0af4b9d7b78222e07 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 4 Mar 2015 06:22:43 +0100
Subject: [PATCH] inc: avoid www exposure of include files (1 of a couple more)

These changes create instability on development images in
conjunctio with mount for core.git:  since files move they
exist in two places at once, maybe screwing up the system.
There's no sensible way other than asking for or building
a new snapshot package for opnsensense and going from there.
---
 src/{www/classes => etc/inc}/maintable.inc | 0
 src/www/load_balancer_monitor.php          | 3 ++-
 src/www/load_balancer_pool.php             | 3 ++-
 src/www/load_balancer_relay_action.php     | 3 ++-
 src/www/load_balancer_relay_protocol.php   | 3 ++-
 src/www/load_balancer_virtual_server.php   | 3 ++-
 6 files changed, 10 insertions(+), 5 deletions(-)
 rename src/{www/classes => etc/inc}/maintable.inc (100%)

diff --git a/src/www/classes/maintable.inc b/src/etc/inc/maintable.inc
similarity index 100%
rename from src/www/classes/maintable.inc
rename to src/etc/inc/maintable.inc
diff --git a/src/www/load_balancer_monitor.php b/src/www/load_balancer_monitor.php
index d5128b1a4..d7d809ab2 100644
--- a/src/www/load_balancer_monitor.php
+++ b/src/www/load_balancer_monitor.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>.
@@ -31,7 +32,7 @@ require_once("functions.inc");
 require_once("filter.inc");
 require_once("shaper.inc");
 require_once("util.inc");
-require_once("classes/maintable.inc");
+require_once("maintable.inc");
 
 if (!is_array($config['load_balancer']['monitor_type'])) {
 	$config['load_balancer']['monitor_type'] = array();
diff --git a/src/www/load_balancer_pool.php b/src/www/load_balancer_pool.php
index 2bafc7103..0b21381fa 100644
--- a/src/www/load_balancer_pool.php
+++ b/src/www/load_balancer_pool.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2005-2008 Bill Marquette <bill.marquette@gmail.com>.
@@ -30,7 +31,7 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("shaper.inc");
-require_once("classes/maintable.inc");
+require_once("maintable.inc");
 
 if (!is_array($config['load_balancer']['lbpool'])) {
 	$config['load_balancer']['lbpool'] = array();
diff --git a/src/www/load_balancer_relay_action.php b/src/www/load_balancer_relay_action.php
index 42eb32ede..80f867e38 100644
--- a/src/www/load_balancer_relay_action.php
+++ b/src/www/load_balancer_relay_action.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>.
@@ -30,7 +31,7 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("shaper.inc");
-require_once("classes/maintable.inc");
+require_once("maintable.inc");
 
 if (!is_array($config['load_balancer']['lbaction'])) {
 	$config['load_balancer']['lbaction'] = array();
diff --git a/src/www/load_balancer_relay_protocol.php b/src/www/load_balancer_relay_protocol.php
index 94f680319..26e5158bb 100644
--- a/src/www/load_balancer_relay_protocol.php
+++ b/src/www/load_balancer_relay_protocol.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>.
@@ -30,7 +31,7 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("shaper.inc");
-require_once("classes/maintable.inc");
+require_once("maintable.inc");
 
 if (!is_array($config['load_balancer']['lbprotocol'])) {
 	$config['load_balancer']['lbprotocol'] = array();
diff --git a/src/www/load_balancer_virtual_server.php b/src/www/load_balancer_virtual_server.php
index 3d7d62e24..3f287624f 100644
--- a/src/www/load_balancer_virtual_server.php
+++ b/src/www/load_balancer_virtual_server.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2005-2008 Bill Marquette <bill.marquette@gmail.com>.
@@ -31,7 +32,7 @@ require_once("functions.inc");
 require_once("filter.inc");
 require_once("shaper.inc");
 require_once("vslb.inc");
-require_once("classes/maintable.inc");
+require_once("maintable.inc");
 
 if (!is_array($config['load_balancer']['virtual_server'])) {
 	$config['load_balancer']['virtual_server'] = array();