diff options
author | jim-p <jimp@netgate.com> | 2019-05-11 18:55:28 -0400 |
---|---|---|
committer | jim-p <jimp@netgate.com> | 2019-05-11 18:55:48 -0400 |
commit | 7ccb452496e7463d508fa32c7450e381f09b468e (patch) | |
tree | 4620c8b539dbeb86262d402b5fc033f402d3e6d1 | |
parent | 6cb5a9376280a8fe7a5de82de83d09cebfd98bd9 (diff) | |
download | pfsense-7ccb452496e7463d508fa32c7450e381f09b468e.zip pfsense-7ccb452496e7463d508fa32c7450e381f09b468e.tar.gz |
Fix ACB privileges. Fixes #9519
(cherry picked from commit 18c1de41332473dacd8a24ddf34e558f6366c714)
-rw-r--r-- | src/etc/inc/priv.defs.inc | 22 | ||||
-rw-r--r-- | src/usr/local/www/services_acb.php | 8 | ||||
-rw-r--r-- | src/usr/local/www/services_acb_backup.php | 8 | ||||
-rw-r--r-- | src/usr/local/www/services_acb_settings.php | 6 |
4 files changed, 36 insertions, 8 deletions
diff --git a/src/etc/inc/priv.defs.inc b/src/etc/inc/priv.defs.inc index 0cb7eae..12a3c10 100644 --- a/src/etc/inc/priv.defs.inc +++ b/src/etc/inc/priv.defs.inc @@ -567,11 +567,23 @@ $priv_list['page-system-packagemanager-installed']['descr'] = gettext("Allow acc $priv_list['page-system-packagemanager-installed']['match'] = array(); $priv_list['page-system-packagemanager-installed']['match'][] = "pkg_mgr_installed.php*"; -$priv_list['page-system-autoconfigbackup'] = array(); -$priv_list['page-system-autoconfigbackup']['name'] = gettext("WebCfg - System: Auto COnfig Backup"); -$priv_list['page-system-autoconfigbackup']['descr'] = gettext("Configure the auto config backup system."); -$priv_list['page-system-autoconfigbackup']['match'] = array(); -$priv_list['page-system-autoconfigbackup']['match'][] = "autoconfigbackup-settings.php*"; +$priv_list['page-services-acb'] = array(); +$priv_list['page-services-acb']['name'] = gettext("WebCfg - Services: Auto Config Backup: Restore"); +$priv_list['page-services-acb']['descr'] = gettext("Restore from auto config backup."); +$priv_list['page-services-acb']['match'] = array(); +$priv_list['page-services-acb']['match'][] = "services_acb.php*"; + +$priv_list['page-services-acb-backup'] = array(); +$priv_list['page-services-acb-backup']['name'] = gettext("WebCfg - Services: Auto Config Backup: Backup Now"); +$priv_list['page-services-acb-backup']['descr'] = gettext("Create a new auto config backup entry."); +$priv_list['page-services-acb-backup']['match'] = array(); +$priv_list['page-services-acb-backup']['match'][] = "services_acb_backup.php*"; + +$priv_list['page-services-acb-settings'] = array(); +$priv_list['page-services-acb-settings']['name'] = gettext("WebCfg - Services: Auto Config Backup: Settings"); +$priv_list['page-services-acb-settings']['descr'] = gettext("Configure the auto config backup system."); +$priv_list['page-services-acb-settings']['match'] = array(); +$priv_list['page-services-acb-settings']['match'][] = "services_acb_settings.php*"; $priv_list['page-services-captiveportal'] = array(); $priv_list['page-services-captiveportal']['name'] = gettext("WebCfg - Services: Captive Portal"); diff --git a/src/usr/local/www/services_acb.php b/src/usr/local/www/services_acb.php index 56bfc6d..054eef3 100644 --- a/src/usr/local/www/services_acb.php +++ b/src/usr/local/www/services_acb.php @@ -18,6 +18,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +##|+PRIV +##|*IDENT=page-services-acb +##|*NAME=Services: Auto Config Backup: Restore +##|*DESCR=Restore from auto config backup. +##|*MATCH=services_acb.php* +##|-PRIV + require("guiconfig.inc"); require("acb.inc"); diff --git a/src/usr/local/www/services_acb_backup.php b/src/usr/local/www/services_acb_backup.php index 085218b..a6bb7d7 100644 --- a/src/usr/local/www/services_acb_backup.php +++ b/src/usr/local/www/services_acb_backup.php @@ -18,6 +18,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +##|+PRIV +##|*IDENT=page-services-acb-backup +##|*NAME=Services: Auto Config Backup: Backup Now +##|*DESCR=Create a new auto config backup entry. +##|*MATCH=services_acb_backup.php* +##|-PRIV + require_once("globals.inc"); require_once("guiconfig.inc"); require_once("acb.inc"); diff --git a/src/usr/local/www/services_acb_settings.php b/src/usr/local/www/services_acb_settings.php index 6d902af..676839e 100644 --- a/src/usr/local/www/services_acb_settings.php +++ b/src/usr/local/www/services_acb_settings.php @@ -24,10 +24,10 @@ */ ##|+PRIV -##|*IDENT=page-system-autoconfigbackup -##|*NAME=System: Auto COnfig Backup +##|*IDENT=page-services-acb-settings +##|*NAME=Services: Auto Config Backup: Settings ##|*DESCR=Configure the auto config backup system. -##|*MATCH=autoconfigbackup-settings.php* +##|*MATCH=services_acb_settings.php* ##|-PRIV require_once("guiconfig.inc"); |