summaryrefslogtreecommitdiff
path: root/lib/plugins/authldap/conf
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2013-06-07 13:23:40 +0200
committerAndreas Gohr <andi@splitbrain.org>2013-06-07 13:23:40 +0200
commite7fbe18945e8d94fd400fd66f36e67174951f290 (patch)
treed542b4a0780b535d27bb54a158bea21f45be3e37 /lib/plugins/authldap/conf
parent12d195ab7189878b41dc4d211befafc79ae402a6 (diff)
downloadrpg-e7fbe18945e8d94fd400fd66f36e67174951f290.tar.gz
rpg-e7fbe18945e8d94fd400fd66f36e67174951f290.tar.bz2
fix ldap deref option FS2798
Do not pass timelimit and deref settings to ldap_search. These values should be set globally via ldap_set_option() instead (as we do for deref).
Diffstat (limited to 'lib/plugins/authldap/conf')
-rw-r--r--lib/plugins/authldap/conf/default.php1
-rw-r--r--lib/plugins/authldap/conf/metadata.php1
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/plugins/authldap/conf/default.php b/lib/plugins/authldap/conf/default.php
index d530d59c9..2c295eeeb 100644
--- a/lib/plugins/authldap/conf/default.php
+++ b/lib/plugins/authldap/conf/default.php
@@ -9,6 +9,7 @@ $conf['groupfilter'] = '';
$conf['version'] = 2;
$conf['starttls'] = 0;
$conf['referrals'] = 0;
+$conf['deref'] = 0;
$conf['binddn'] = '';
$conf['bindpw'] = '';
//$conf['mapping']['name'] unsupported in config manager
diff --git a/lib/plugins/authldap/conf/metadata.php b/lib/plugins/authldap/conf/metadata.php
index fc5b2e63c..a3256628c 100644
--- a/lib/plugins/authldap/conf/metadata.php
+++ b/lib/plugins/authldap/conf/metadata.php
@@ -8,6 +8,7 @@ $meta['groupfilter'] = array('string');
$meta['version'] = array('numeric');
$meta['starttls'] = array('onoff');
$meta['referrals'] = array('onoff');
+$meta['deref'] = array('multichoice','_choices' => array(0,1,2,3));
$meta['binddn'] = array('string');
$meta['bindpw'] = array('password');
//$meta['mapping']['name'] unsupported in config manager