[Pkg-samba-maint] r1792 - branches/samba/experimental/debian/patches

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-03-25 08:40:38 +0000 (Tue, 25 Mar 2008)
New Revision: 1792

Modified:
   branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch
Log:
fix the cache_path() function to use the current idioms in Samba 3.2.



Modified: branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch	2008-03-25 08:28:27 UTC (rev 1791)
+++ branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch	2008-03-25 08:40:38 UTC (rev 1792)
@@ -50,7 +50,7 @@
 ===================================================================
 --- samba-3.2.0pre2.orig/source/lib/util.c
 +++ samba-3.2.0pre2/source/lib/util.c
-@@ -2543,6 +2543,27 @@
+@@ -2543,6 +2543,15 @@
  	return xx_path(name, get_dyn_STATEDIR());
  }
  
@@ -60,19 +60,7 @@
 + *****************************************************************/
 +char *cache_path(char *name)
 +{
-+	static pstring fname;
-+
-+	pstrcpy(fname,dyn_CACHEDIR());
-+	trim_string(fname,"","/");
-+
-+	if (!directory_exist(fname,NULL)) {
-+			mkdir(fname,0755);
-+	}
-+
-+	pstrcat(fname,"/");
-+	pstrcat(fname,name);
-+
-+	return fname;
++	return xx_path(name, get_dyn_CACHEDIR());
 +}
 +
  /**