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

[bubulle at alioth.debian.org]

tags 514703 pending
thanks

Author: bubulle
Date: 2009-03-01 09:01:49 +0000 (Sun, 01 Mar 2009)
New Revision: 2622

Added:
   branches/samba/lenny/debian/patches/bug_514703_upstream_6021.patch
Modified:
   branches/samba/lenny/debian/changelog
   branches/samba/lenny/debian/patches/series
Log:
Correct du recurion in smbclient


Modified: branches/samba/lenny/debian/changelog
===================================================================
--- branches/samba/lenny/debian/changelog	2009-03-01 03:31:17 UTC (rev 2621)
+++ branches/samba/lenny/debian/changelog	2009-03-01 09:01:49 UTC (rev 2622)
@@ -1,6 +1,7 @@
 samba (2:3.2.5-4lenny1) UNRELEASED; urgency=low
 
   * Fix account locking with an LDAP backend. Closes: #514151
+  * Correct du recursion in smbclient. Closes: #514703
 
  -- Christian Perrier <bubulle at debian.org>  Sat, 28 Feb 2009 19:42:05 +0100
 

Added: branches/samba/lenny/debian/patches/bug_514703_upstream_6021.patch
===================================================================
--- branches/samba/lenny/debian/patches/bug_514703_upstream_6021.patch	                        (rev 0)
+++ branches/samba/lenny/debian/patches/bug_514703_upstream_6021.patch	2009-03-01 09:01:49 UTC (rev 2622)
@@ -0,0 +1,48 @@
+Goal: Correct du recursion in smbclient
+
+Fixes: #514703
+
+Status wrt upstream: Fixed in 3.2.8
+
+Author: Jeremy Allison <jra at samba.org>
+
+Note: This patch was proposed by Jeremy Allison in the upstream bug report
+      (https://bugzilla.samba.org/show_bug.cgi?id=6021).
+
+Index: samba-3.2.5/source/client/client.c
+===================================================================
+--- samba-3.2.5.orig/source/client/client.c
++++ samba-3.2.5/source/client/client.c
+@@ -728,11 +728,11 @@
+ 				return;
+ 			}
+ 			p = strrchr_m(mask2,CLI_DIRSEP_CHAR);
+-			if (!p) {
+-				TALLOC_FREE(dir);
+-				return;
++			if (p) {
++				p[1] = 0;
++			} else {
++				mask2[0] = '\0';
+ 			}
+-			p[1] = 0;
+ 			mask2 = talloc_asprintf_append(mask2,
+ 					"%s%s*",
+ 					f->name,
+Index: samba-3.2.5/source/libsmb/clidfs.c
+===================================================================
+--- samba-3.2.5.orig/source/libsmb/clidfs.c
++++ samba-3.2.5/source/libsmb/clidfs.c
+@@ -306,10 +306,11 @@
+ 	}
+ 
+ 	if (p) {
+-		char *name = clean_name(NULL, p->mount);
++		char *name = clean_name(NULL, mnt);
+ 		if (!name) {
+ 			return;
+ 		}
++		TALLOC_FREE(p->mount);
+ 		p->mount = talloc_strdup(p, name);
+ 		TALLOC_FREE(name);
+ 	}

Modified: branches/samba/lenny/debian/patches/series
===================================================================
--- branches/samba/lenny/debian/patches/series	2009-03-01 03:31:17 UTC (rev 2621)
+++ branches/samba/lenny/debian/patches/series	2009-03-01 09:01:49 UTC (rev 2622)
@@ -24,3 +24,4 @@
 bug_500129_upstream_5953.patch
 bug_509101_upstream_5904.patch
 account_lock_LDAP.patch
+bug_514703_upstream_6021.patch