[Pkg-samba-maint] r2726 - in branches/samba/lenny/debian: . patches

[bubulle at alioth.debian.org]

tags 522907 pending
thanks

Author: bubulle
Date: 2009-04-24 08:26:43 +0000 (Fri, 24 Apr 2009)
New Revision: 2726

Added:
   branches/samba/lenny/debian/patches/bug_522907_upstream_6279.patch
Modified:
   branches/samba/lenny/debian/changelog
   branches/samba/lenny/debian/patches/series
Log:
Fix #522907 for lenny


Modified: branches/samba/lenny/debian/changelog
===================================================================
--- branches/samba/lenny/debian/changelog	2009-04-24 08:00:25 UTC (rev 2725)
+++ branches/samba/lenny/debian/changelog	2009-04-24 08:26:43 UTC (rev 2726)
@@ -1,3 +1,11 @@
+samba (2:3.2.5-4lenny3) UNRELEASED; urgency=low
+
+  * Have ldap_search_with_timeout() always returns LDAP_TIMELIMIT_EXCEEDED
+    when OpenLDAP times out. THat fixes daily winbind crashes for users
+    Closes: #522907
+
+ -- Christian Perrier <bubulle at debian.org>  Fri, 24 Apr 2009 10:24:01 +0200
+
 samba (2:3.2.5-4lenny2) stable-proposed-updates; urgency=low
 
   * Do not abort rename process on valid rename script. Closes: #519974

Added: branches/samba/lenny/debian/patches/bug_522907_upstream_6279.patch
===================================================================
--- branches/samba/lenny/debian/patches/bug_522907_upstream_6279.patch	                        (rev 0)
+++ branches/samba/lenny/debian/patches/bug_522907_upstream_6279.patch	2009-04-24 08:26:43 UTC (rev 2726)
@@ -0,0 +1,25 @@
+Goal: Fix winbind crashes when interacting with OpenLDAP by having
+      ldap_search_with_timeout() always returns LDAP_TIMELIMIT_EXCEEDED
+      in the error case
+
+Fixes: #522907
+
+Status wrt upstream: Fixed in 3.3.4
+
+Author: Jeremy Allison <jra at samba.org>
+
+Index: samba-3.2.5/source/libads/ldap.c
+===================================================================
+--- samba-3.2.5.orig/source/libads/ldap.c
++++ samba-3.2.5/source/libads/ldap.c
+@@ -118,6 +118,10 @@
+ 	if (gotalarm != 0)
+ 		return LDAP_TIMELIMIT_EXCEEDED;
+ 
++	if (*res == NULL) {
++		return LDAP_TIMELIMIT_EXCEEDED;
++	}
++
+ 	return result;
+ }
+ 

Modified: branches/samba/lenny/debian/patches/series
===================================================================
--- branches/samba/lenny/debian/patches/series	2009-04-24 08:00:25 UTC (rev 2725)
+++ branches/samba/lenny/debian/patches/series	2009-04-24 08:26:43 UTC (rev 2726)
@@ -27,3 +27,4 @@
 bug_514703_upstream_6021.patch
 bug_519974_upstream_5957.patch
 bug_520284_upstream_6160.patch
+bug_522907_upstream_6279.patch