merge master in branch

2 files changed, 39 insertions, 0 deletions

diff --git a/lib/plugins/authldap/conf/default.php b/lib/plugins/authldap/conf/default.php
new file mode 100644
index 000000000..2c295eeeb
--- /dev/null
+++ b/lib/plugins/authldap/conf/default.php
@@ -0,0 +1,20 @@
+<?php
+
+$conf['server']      = '';
+$conf['port']        = 389;
+$conf['usertree']    = '';
+$conf['grouptree']   = '';
+$conf['userfilter']  = '';
+$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
+//$conf['mapping']['grps']  unsupported in config manager
+$conf['userscope']  = 'sub';
+$conf['groupscope'] = 'sub';
+$conf['groupkey']   = 'cn';
+$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
new file mode 100644
index 000000000..a3256628c
--- /dev/null
+++ b/lib/plugins/authldap/conf/metadata.php
@@ -0,0 +1,19 @@
+<?php
+$meta['server']      = array('string');
+$meta['port']        = array('numeric');
+$meta['usertree']    = array('string');
+$meta['grouptree']   = array('string');
+$meta['userfilter']  = array('string');
+$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
+//$meta['mapping']['grps']  unsupported in config manager
+$meta['userscope']   = array('multichoice','_choices' => array('sub','one','base'));
+$meta['groupscope']  = array('multichoice','_choices' => array('sub','one','base'));
+$meta['groupkey']    = array('string');
+$meta['debug']       = array('onoff');
\ No newline at end of file