From 267e765e7f9433997a7e31ccaca5d8b3bfa49fe1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 26 Jan 2011 09:54:49 +0100
Subject: [PATCH] AD auth: set capabilities after handling multi domain setups
---
inc/auth/ad.class.php | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php
index 93186d9a1..9ffd3e18b 100644
--- a/inc/auth/ad.class.php
+++ b/inc/auth/ad.class.php
@@ -52,12 +52,6 @@ class auth_ad extends auth_basic {
global $conf;
$this->cnf = $conf['auth']['ad'];
- // we can change the password if SSL is set
- if($this->cnf['use_ssl'] || $this->cnf['use_tls']){
- $this->cando['modPass'] = true;
- }
- $this->cando['modName'] = true;
- $this->cando['modMail'] = true;
// additional information fields
if (isset($this->cnf['additional'])) {
@@ -105,7 +99,12 @@ class auth_ad extends auth_basic {
$this->opts['domain_controllers'] = array_map('trim',$this->opts['domain_controllers']);
$this->opts['domain_controllers'] = array_filter($this->opts['domain_controllers']);
- // we currently just handle authentication, so no capabilities are set
+ // we can change the password if SSL is set
+ if($this->opts['use_ssl'] || $this->opts['use_tls']){
+ $this->cando['modPass'] = true;
+ }
+ $this->cando['modName'] = true;
+ $this->cando['modMail'] = true;
}
/**
--
GitLab