diff options
| author | Marcello Coutinho <marcellocoutinho@gmail.com> | 2013-09-20 16:17:23 -0300 |
|---|---|---|
| committer | Marcello Coutinho <marcellocoutinho@gmail.com> | 2013-09-20 16:17:23 -0300 |
| commit | c16d9d2e0bc7f6dfe40b11133990abd195b32261 (patch) | |
| tree | 6b281e8a9ae1d2f3145f4010633596a030d1aaaf | |
| parent | 363f8fa7df7981d8bc96750b273a125355c347f4 (diff) | |
| download | pfsense-packages-c16d9d2e0bc7f6dfe40b11133990abd195b32261.tar.gz pfsense-packages-c16d9d2e0bc7f6dfe40b11133990abd195b32261.tar.bz2 pfsense-packages-c16d9d2e0bc7f6dfe40b11133990abd195b32261.zip | |
sarg - remove unset_gd from compile options and add missing ldap option on usertab field
| -rw-r--r-- | config/sarg/sarg.inc | 1 | ||||
| -rw-r--r-- | pkg_config.8.xml | 4 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/config/sarg/sarg.inc b/config/sarg/sarg.inc index e4740b42..97abc138 100644 --- a/config/sarg/sarg.inc +++ b/config/sarg/sarg.inc @@ -291,6 +291,7 @@ function sync_package_sarg() { file_put_contents( SARG_DIR . '/etc/sarg/usertab.conf', sarg_text_area_decode($sarguser['usertab']),LOCK_EX); } if($sarguser['ldap_enable']){ + $usertab="ldap"; $LDAPHost=(empty($sarguser['ldap_host'])?"":"LDAPHost ".$sarguser['ldap_host']); $LDAPort=(empty($sarguser['ldap_port'])?"":"LDAPPort ".$sarguser['ldap_port']); $LDAPBindDN=(empty($sarguser['ldap_bind_dn'])?"":"LDAPBindDN ".$sarguser['ldap_bind_dn']); diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 2ac3b694..745fe6c6 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -715,12 +715,12 @@ <depends_on_package>sarg-2.3.6.tbz</depends_on_package> <depends_on_package>gd-2.0.35_8,1.tbz</depends_on_package> <depends_on_package_pbi>sarg-2.3.6-i386.pbi</depends_on_package_pbi> - <version>2.3.6 pkg v.0.6.2</version> + <version>2.3.6 pkg v.0.6.3</version> <status>Release</status> <required_version>2.0</required_version> <configurationfile>sarg.xml</configurationfile> <build_port_path>/usr/ports/www/sarg</build_port_path> - <build_options>sarg_UNSET=GD PHP</build_options> + <build_options>sarg_UNSET=PHP</build_options> <after_install_info>Please visit sarg settings on Status Menu to configure sarg.</after_install_info> </package> <package> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 5e3e611e..e1be34bc 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -702,12 +702,12 @@ <depends_on_package>sarg-2.3.6.tbz</depends_on_package> <depends_on_package>gd-2.0.35_8,1.tbz</depends_on_package> <depends_on_package_pbi>sarg-2.3.6-amd64.pbi</depends_on_package_pbi> - <version>2.3.6 pkg v.0.6.2</version> + <version>2.3.6 pkg v.0.6.3</version> <status>Release</status> <required_version>2.0</required_version> <configurationfile>sarg.xml</configurationfile> <build_port_path>/usr/ports/www/sarg</build_port_path> - <build_options>sarg_UNSET=GD PHP</build_options> + <build_options>sarg_UNSET=PHP</build_options> <after_install_info>Please visit sarg settings on Status Menu to configure sarg.</after_install_info> </package> <package> |