[Pkg-mediawiki-commits] r254 - in mediawiki-extensions/trunk/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2011-04-12 12:32:36 +0000 (Tue, 12 Apr 2011)
New Revision: 254

Added:
   mediawiki-extensions/trunk/debian/patches/fix_ldapauth.patch
Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/patches/series
Log:
incorporate patch from Launchpad for fixing LDAP Auth


Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================
--- mediawiki-extensions/trunk/debian/changelog	2011-04-12 12:27:06 UTC (rev 253)
+++ mediawiki-extensions/trunk/debian/changelog	2011-04-12 12:32:36 UTC (rev 254)
@@ -9,8 +9,9 @@
     - contains PHP 5.3 compatibility for ConfirmEdit (Closes: #612227)
     - newer GraphViz extension (LP: #720217)
   * Acknowledge NMU by Stefano Rivera, thanks! (patch was superseded)
+  * Fix LDAP Auth by John Franklin (LP: #668589)
 
- -- Thorsten Glaser <tg at mirbsd.de>  Tue, 12 Apr 2011 13:46:42 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 12 Apr 2011 14:31:42 +0200
 
 mediawiki-extensions (2.3+nmu1) unstable; urgency=low
 

Added: mediawiki-extensions/trunk/debian/patches/fix_ldapauth.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_ldapauth.patch	                        (rev 0)
+++ mediawiki-extensions/trunk/debian/patches/fix_ldapauth.patch	2011-04-12 12:32:36 UTC (rev 254)
@@ -0,0 +1,25 @@
+$Id$
+
+Fix LDAP Auth extension:
+* Don’t overwrite connection pointer with nil (LP: #668589)
+* Pass the correct number of arguments to getSearchString
+  (LP: #668589) (fixed upstream)
+
+Index: trunk/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php
+===================================================================
+--- trunk.orig/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php	2011-04-12 14:29:21.000000000 +0200
++++ trunk/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php	2011-04-12 14:30:00.000000000 +0200
+@@ -115,11 +115,11 @@
+ 			return true;
+ 		}
+ 
+-		$this->ldapconn = $this->connect();
++		$this->connect();	/* sets $this->ldapconn as a side effect */
+ 		if ( $this->ldapconn ) {
+ 			$this->printDebug( "Successfully connected", NONSENSITIVE );
+ 
+-			$searchstring = $this->getSearchString( $this->ldapconn, $username );
++			$searchstring = $this->getSearchString($username);
+ 
+ 			//If we are using auto authentication, and we got
+ 			//anything back, then the user exists.


Property changes on: mediawiki-extensions/trunk/debian/patches/fix_ldapauth.patch
___________________________________________________________________
Added: svn:keywords
   + Author CVSHeader Date Id LastChangedBy LastChangedDate LastChangedRevision Log Revision Source State

Modified: mediawiki-extensions/trunk/debian/patches/series
===================================================================
--- mediawiki-extensions/trunk/debian/patches/series	2011-04-12 12:27:06 UTC (rev 253)
+++ mediawiki-extensions/trunk/debian/patches/series	2011-04-12 12:32:36 UTC (rev 254)
@@ -7,3 +7,4 @@
 fix_newestpages.patch
 fix_rssreader.patch
 fix_interwiki.patch
+fix_ldapauth.patch