http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97561

Revision: 97561
Author:   reedy
Date:     2011-09-19 21:25:57 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
if $wgAuth isn't the LDAP stuff, die with a semi useful error message

Modified Paths:
--------------
    trunk/extensions/OpenStackManager/OpenStackNovaUser.php

Modified: trunk/extensions/OpenStackManager/OpenStackNovaUser.php
===================================================================
--- trunk/extensions/OpenStackManager/OpenStackNovaUser.php     2011-09-19 
21:24:20 UTC (rev 97560)
+++ trunk/extensions/OpenStackManager/OpenStackNovaUser.php     2011-09-19 
21:25:57 UTC (rev 97561)
@@ -266,6 +266,9 @@
                global $wgOpenStackManagerLDAPUser, 
$wgOpenStackManagerLDAPUserPassword;
                global $wgOpenStackManagerLDAPDomain;
 
+               if ( !$wgAuth instanceof LdapAuthenticationPlugin ) {
+                       die( 'Install and configure the <a 
href="http://www.mediawiki.org/wiki/Extension:LDAP_Authentication";>LDAP 
Authentication</a> extension' );
+               }
                $wgAuth->connect( $wgOpenStackManagerLDAPDomain );
                $wgAuth->bindAs( $wgOpenStackManagerLDAPUser, 
$wgOpenStackManagerLDAPUserPassword );
        }


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to