diff options
author | Klap-in <klapinklapin@gmail.com> | 2013-06-09 21:22:12 +0200 |
---|---|---|
committer | Klap-in <klapinklapin@gmail.com> | 2013-06-09 21:22:12 +0200 |
commit | 9b6fa49c06b538c53c9cf3e404ade82d6c003f79 (patch) | |
tree | 68771b589052382f9e4824bf3a4857f5648fdf3d /lib/plugins/authldap/conf | |
parent | a38a6f25d7e46f47a8f358bb16c766f5b96dae45 (diff) | |
parent | 62765857f84626449d6c53b1a46c462a37e5083a (diff) | |
download | rpg-9b6fa49c06b538c53c9cf3e404ade82d6c003f79.tar.gz rpg-9b6fa49c06b538c53c9cf3e404ade82d6c003f79.tar.bz2 |
Merge remote-tracking branch 'origin/master' into fetchimagetokexternal
Diffstat (limited to 'lib/plugins/authldap/conf')
-rw-r--r-- | lib/plugins/authldap/conf/default.php | 3 | ||||
-rw-r--r-- | lib/plugins/authldap/conf/metadata.php | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/plugins/authldap/conf/default.php b/lib/plugins/authldap/conf/default.php index d07f9c82e..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 @@ -16,4 +17,4 @@ $conf['bindpw'] = ''; $conf['userscope'] = 'sub'; $conf['groupscope'] = 'sub'; $conf['groupkey'] = 'cn'; -$conf['debug'] = array('onoff');
\ No newline at end of file +$conf['debug'] = 0;
\ No newline at end of file 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 |