diff options
author | sullrich <sullrich@pfsense.org> | 2009-12-03 16:10:44 -0500 |
---|---|---|
committer | sullrich <sullrich@pfsense.org> | 2009-12-03 16:10:44 -0500 |
commit | 9f1a35659dbe89b206091ea56744be667991d7a4 (patch) | |
tree | fb8c2abd09e9708de6af8ee0be63f00b00fb8847 | |
parent | 6b6e8d0825f9ea77d40425f34649523abfea9f1d (diff) | |
download | pfsense-9f1a35659dbe89b206091ea56744be667991d7a4.zip pfsense-9f1a35659dbe89b206091ea56744be667991d7a4.tar.gz |
Load pkg privs from /usr/local/pkg/priv if it exists
-rw-r--r-- | etc/inc/priv.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/inc/priv.inc b/etc/inc/priv.inc index 4ff4905..74ee212 100644 --- a/etc/inc/priv.inc +++ b/etc/inc/priv.inc @@ -45,9 +45,8 @@ */ /* Load and process custom privs. */ -function load_custom_privs() { +function load_custom_privs($directory) { global $priv_list; - $directory = "/etc/inc/priv"; $dir_array = array(); if(!is_dir($directory)) return; @@ -71,7 +70,9 @@ function load_custom_privs() { } // Load and sort privs -load_custom_privs(); +load_custom_privs("/etc/inc/priv"); +if(is_dir("/usr/local/pkg/priv")) + load_custom_privs("/usr/local/pkg/priv"); sort_privs($priv_list); function cmp_privkeys($a, $b) { |