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/authad | |
| 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/authad')
| -rw-r--r-- | lib/plugins/authad/auth.php | 5 | ||||
| -rw-r--r-- | lib/plugins/authad/conf/default.php | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php index b6b5dd268..fcbd2eeef 100644 --- a/lib/plugins/authad/auth.php +++ b/lib/plugins/authad/auth.php @@ -489,6 +489,11 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { $this->cando['modPass'] = false; } + // adLDAP expects empty user/pass as NULL, we're less strict FS#2781 + if(empty($opts['admin_username'])) $opts['admin_username'] = null; + if(empty($opts['admin_password'])) $opts['admin_password'] = null; + + // user listing needs admin priviledges if(!empty($opts['admin_username']) && !empty($opts['admin_password'])) { $this->cando['getUsers'] = true; } else { diff --git a/lib/plugins/authad/conf/default.php b/lib/plugins/authad/conf/default.php index 9274db209..f71202cfc 100644 --- a/lib/plugins/authad/conf/default.php +++ b/lib/plugins/authad/conf/default.php @@ -4,8 +4,8 @@ $conf['account_suffix'] = ''; $conf['base_dn'] = ''; $conf['domain_controllers'] = ''; $conf['sso'] = 0; -$conf['admin_username'] = ''; -$conf['admin_password'] = ''; +$conf['admin_username'] = ''; +$conf['admin_password'] = ''; $conf['real_primarygroup'] = 0; $conf['use_ssl'] = 0; $conf['use_tls'] = 0; |