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

[bubulle at alioth.debian.org]

tags 519974 pending
thanks

Author: bubulle
Date: 2009-03-22 10:43:54 +0000 (Sun, 22 Mar 2009)
New Revision: 2670

Added:
   branches/samba/lenny/debian/patches/bug_519974_upstream_5957.patch
Modified:
   branches/samba/lenny/debian/changelog
   branches/samba/lenny/debian/patches/series
Log:
Do not abort rename process on valid rename script


Modified: branches/samba/lenny/debian/changelog
===================================================================
--- branches/samba/lenny/debian/changelog	2009-03-21 22:11:16 UTC (rev 2669)
+++ branches/samba/lenny/debian/changelog	2009-03-22 10:43:54 UTC (rev 2670)
@@ -1,3 +1,9 @@
+samba (2:3.2.5-4lenny2) UNRELEASED; urgency=low
+
+  * Do not abort rename process on valid rename script. Closes: #519974
+
+ -- Christian Perrier <bubulle at debian.org>  Sun, 22 Mar 2009 11:42:53 +0100
+
 samba (2:3.2.5-4lenny1) stable-proposed-updates; urgency=low
 
   * Fix account locking with an LDAP backend. Closes: #514151

Added: branches/samba/lenny/debian/patches/bug_519974_upstream_5957.patch
===================================================================
--- branches/samba/lenny/debian/patches/bug_519974_upstream_5957.patch	                        (rev 0)
+++ branches/samba/lenny/debian/patches/bug_519974_upstream_5957.patch	2009-03-22 10:43:54 UTC (rev 2670)
@@ -0,0 +1,21 @@
+Goal: do not abort rename process on valid rename script
+
+Fixes: #519974
+
+Status wrt upstream: Fixed in 3.2.6
+
+Author: Guenther Deschner <gd at samba.org>
+
+Index: lenny/source/passdb/pdb_ldap.c
+===================================================================
+--- lenny.orig/source/passdb/pdb_ldap.c
++++ lenny/source/passdb/pdb_ldap.c
+@@ -2010,7 +2010,7 @@
+ 					newname_lower,
+ 					true,
+ 					true);
+-	if (rename_script) {
++	if (!rename_script) {
+ 		return NT_STATUS_NO_MEMORY;
+ 	}
+ 	rename_script = realloc_string_sub2(rename_script,

Modified: branches/samba/lenny/debian/patches/series
===================================================================
--- branches/samba/lenny/debian/patches/series	2009-03-21 22:11:16 UTC (rev 2669)
+++ branches/samba/lenny/debian/patches/series	2009-03-22 10:43:54 UTC (rev 2670)
@@ -25,3 +25,4 @@
 bug_509101_upstream_5904.patch
 bug_514151_upstream_5825.patch
 bug_514703_upstream_6021.patch
+bug_519974_upstream_5957.patch