http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95944
Revision: 95944
Author: laner
Date: 2011-09-01 07:28:10 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
Ensure userdn is searched using the user's wiki name, if we are using uid as
the attribute, otherwise the dn search will use the incorrect attribute with
the username.
Modified Paths:
--------------
trunk/extensions/OpenStackManager/OpenStackNovaUser.php
Modified: trunk/extensions/OpenStackManager/OpenStackNovaUser.php
===================================================================
--- trunk/extensions/OpenStackManager/OpenStackNovaUser.php 2011-09-01
07:24:44 UTC (rev 95943)
+++ trunk/extensions/OpenStackManager/OpenStackNovaUser.php 2011-09-01
07:28:10 UTC (rev 95944)
@@ -20,8 +20,9 @@
*/
function fetchUserInfo() {
global $wgAuth, $wgUser;
+ global $wgOpenStackManagerLDAPUseUidAsNamingAttribute;
- if ( $this->username ) {
+ if ( $this->username &&
!$wgOpenStackManagerLDAPUseUidAsNamingAttribute ) {
$this->userDN = $wgAuth->getUserDN( strtolower(
$this->username ) );
} else {
$this->userDN = $wgAuth->getUserDN( strtolower(
$wgUser->getName() ) );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
