From 70e4a085e6a861a12a7b927ba9dfa10d5961f958 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Nov 2012 15:36:35 +0100
Subject: fixes for authldap

* makes proper use of plugin config
* adds a few first defaults, but the whole config metadata is still
  missing
* proper PHP5 use and comments
---
 lib/plugins/authldap/conf/default.php | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 lib/plugins/authldap/conf/default.php

(limited to 'lib/plugins/authldap/conf')

diff --git a/lib/plugins/authldap/conf/default.php b/lib/plugins/authldap/conf/default.php
new file mode 100644
index 000000000..35971d41d
--- /dev/null
+++ b/lib/plugins/authldap/conf/default.php
@@ -0,0 +1,7 @@
+<?php
+
+$conf['port'] = 389;
+
+$conf['groupkey']   = 'cn';
+$conf['userscope']  = 'sub';
+$conf['groupscope'] = 'sub';
\ No newline at end of file
-- 
cgit v1.2.3


From 10bf81481e437a9c202db678672484b74c05bbf6 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 2 Feb 2013 13:32:24 +0100
Subject: dded config metadata for authldap plugin

---
 lib/plugins/authldap/conf/metadata.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 lib/plugins/authldap/conf/metadata.php

(limited to 'lib/plugins/authldap/conf')

diff --git a/lib/plugins/authldap/conf/metadata.php b/lib/plugins/authldap/conf/metadata.php
new file mode 100644
index 000000000..e0815f789
--- /dev/null
+++ b/lib/plugins/authldap/conf/metadata.php
@@ -0,0 +1,17 @@
+<?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['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['debug']       = array('onoff');
\ No newline at end of file
-- 
cgit v1.2.3


From 45970804e69e3d087fe19ad9cefaff0ef44be795 Mon Sep 17 00:00:00 2001
From: Klap-in <klapinklapin@gmail.com>
Date: Sat, 16 Feb 2013 22:53:38 +0100
Subject: Complete metadata and defaults of auth plugin configs

---
 lib/plugins/authldap/conf/default.php  | 20 ++++++++++++++++----
 lib/plugins/authldap/conf/metadata.php |  1 +
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/authldap/conf')

diff --git a/lib/plugins/authldap/conf/default.php b/lib/plugins/authldap/conf/default.php
index 35971d41d..d07f9c82e 100644
--- a/lib/plugins/authldap/conf/default.php
+++ b/lib/plugins/authldap/conf/default.php
@@ -1,7 +1,19 @@
 <?php
 
-$conf['port'] = 389;
-
-$conf['groupkey']   = 'cn';
+$conf['server']      = '';
+$conf['port']        = 389;
+$conf['usertree']    = '';
+$conf['grouptree']   = '';
+$conf['userfilter']  = '';
+$conf['groupfilter'] = '';
+$conf['version']     = 2;
+$conf['starttls']    = 0;
+$conf['referrals']   = 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';
\ No newline at end of file
+$conf['groupscope'] = 'sub';
+$conf['groupkey']   = 'cn';
+$conf['debug']      = array('onoff');
\ No newline at end of file
diff --git a/lib/plugins/authldap/conf/metadata.php b/lib/plugins/authldap/conf/metadata.php
index e0815f789..fc5b2e63c 100644
--- a/lib/plugins/authldap/conf/metadata.php
+++ b/lib/plugins/authldap/conf/metadata.php
@@ -14,4 +14,5 @@ $meta['bindpw']      = array('password');
 //$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
-- 
cgit v1.2.3


From 6b519690e45cefe83fbef5691e372c6078c3fb9b Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 27 May 2013 16:26:40 +0100
Subject: fixed broken default config options (FS#2789)

---
 lib/plugins/authldap/conf/default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/authldap/conf')

diff --git a/lib/plugins/authldap/conf/default.php b/lib/plugins/authldap/conf/default.php
index d07f9c82e..d530d59c9 100644
--- a/lib/plugins/authldap/conf/default.php
+++ b/lib/plugins/authldap/conf/default.php
@@ -16,4 +16,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
-- 
cgit v1.2.3


From e7fbe18945e8d94fd400fd66f36e67174951f290 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 7 Jun 2013 13:23:40 +0200
Subject: 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).
---
 lib/plugins/authldap/conf/default.php  | 1 +
 lib/plugins/authldap/conf/metadata.php | 1 +
 2 files changed, 2 insertions(+)

(limited to 'lib/plugins/authldap/conf')

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
-- 
cgit v1.2.3