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

[Thorsten Glaser]

Author: tg
Date: 2012-11-29 15:56:33 +0000 (Thu, 29 Nov 2012)
New Revision: 400

Added:
   mediawiki-extensions/trunk/debian/patches/fix_694114.patch
Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/patches/series
Log:
Apply patch pointed out in <ea2f051719804e8747c07f669f5976b2 at mail.herzbube.ch>


Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================
--- mediawiki-extensions/trunk/debian/changelog	2012-11-26 10:26:13 UTC (rev 399)
+++ mediawiki-extensions/trunk/debian/changelog	2012-11-29 15:56:33 UTC (rev 400)
@@ -1,3 +1,10 @@
+mediawiki-extensions (3.0) experimental; urgency=low
+
+  * Apply upstream commit 9ccef963bc825075db6d6b6458bdfde1ebcab6d1
+    to possibly fix $wgLDAPAuthAttribute in LDAP Auth (Closes: #694114)
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Thu, 29 Nov 2012 16:55:02 +0100
+
 mediawiki-extensions (2.9) unstable; urgency=low
 
   * Collection: fix downloading generated PDFs from the render server

Added: mediawiki-extensions/trunk/debian/patches/fix_694114.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_694114.patch	                        (rev 0)
+++ mediawiki-extensions/trunk/debian/patches/fix_694114.patch	2012-11-29 15:56:33 UTC (rev 400)
@@ -0,0 +1,38 @@
+From 9ccef963bc825075db6d6b6458bdfde1ebcab6d1 Mon Sep 17 00:00:00 2001
+From: Ryan Lane <laner at users.mediawiki.org>
+Date: Thu, 15 Mar 2012 00:04:49 +0000
+Subject: [PATCH] Reverting AuthAttribute back to former implementation. I
+ really need to read my own documentation before I make
+ stupid changes like this.
+
+---
+ LdapAuthentication.php |   11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+--- a/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php
++++ b/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php
+@@ -677,7 +677,11 @@ class LdapAuthenticationPlugin extends A
+ 			$aa = $this->getConf( 'AuthAttribute' ); 
+ 			if ( $aa ) {
+ 				$this->printDebug( "Checking for auth attributes: $aa", NONSENSITIVE );
+-				if ( !isset( $this->userInfo ) || !isset( $this->userInfo[0][$aa] ) ) {
++				$filter = "(" . $aa . ")";
++				$attributes = array( "dn" );
++				$entry = LdapAuthenticationPlugin::ldap_read( $this->ldapconn, $this->userdn, $filter, $attributes );
++				$info = LdapAuthenticationPlugin::ldap_get_entries( $this->ldapconn, $entry );
++				if ( $info["count"] < 1 ) {
+ 					$this->printDebug( "Failed auth attribute check", NONSENSITIVE );
+ 					LdapAuthenticationPlugin::ldap_unbind( $this->ldapconn );
+ 					$this->markAuthFailed();
+@@ -998,11 +1002,6 @@ class LdapAuthenticationPlugin extends A
+ 				return false;
+ 			}
+ 
+-			$aa = $this->getConf( 'AuthAttribute' );
+-			if ( $aa ) {
+-				$values[$aa] = "true";
+-			}
+-
+ 			$this->printDebug( "Adding user", NONSENSITIVE );
+ 			if ( LdapAuthenticationPlugin::ldap_add( $this->ldapconn, $this->userdn, $values ) ) {
+ 				$this->printDebug( "Successfully added user", NONSENSITIVE );

Modified: mediawiki-extensions/trunk/debian/patches/series
===================================================================
--- mediawiki-extensions/trunk/debian/patches/series	2012-11-26 10:26:13 UTC (rev 399)
+++ mediawiki-extensions/trunk/debian/patches/series	2012-11-29 15:56:33 UTC (rev 400)
@@ -9,3 +9,4 @@
 fix_pagecss.patch
 fix_rssreader.patch
 news_dont_break_feeds.patch
+fix_694114.patch