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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-10-21 04:59:46 +0000 (Sun, 21 Oct 2007)
New Revision: 1536

Modified:
   branches/samba/experimental/debian/patches/fhs-filespaths.patch
   branches/samba/experimental/debian/patches/fhs-newpaths.patch
Log:
merge revision 1535 from trunk



Modified: branches/samba/experimental/debian/patches/fhs-filespaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-filespaths.patch	2007-10-21 04:50:13 UTC (rev 1535)
+++ branches/samba/experimental/debian/patches/fhs-filespaths.patch	2007-10-21 04:59:46 UTC (rev 1536)
@@ -59,52 +59,6 @@
  	if (stat(msg_path, &st) != 0) {
  		/* the msg file isn't available */
  		DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path, 
-Index: samba-3.2.0pre1/source/lib/util.c
-===================================================================
---- samba-3.2.0pre1.orig/source/lib/util.c
-+++ samba-3.2.0pre1/source/lib/util.c
-@@ -2655,6 +2655,41 @@
- }
- 
- /**
-+ * @brief Returns an absolute path to a file in the Samba data directory.
-+ *
-+ * @param name File to find, relative to CODEPAGEDIR.
-+ *
-+ * @retval Pointer to a static #pstring containing the full path.
-+ **/
-+
-+char *data_path(const char *name)
-+{
-+	static pstring fname;
-+	snprintf(fname, sizeof(fname), "%s/%s", dyn_CODEPAGEDIR, name);
-+	return fname;
-+}
-+
-+/*****************************************************************
-+a useful function for returning a path in the Samba state directory
-+ *****************************************************************/
-+char *state_path(char *name)
-+{
-+	static pstring fname;
-+
-+	pstrcpy(fname,dyn_STATEDIR());
-+	trim_string(fname,"","/");
-+
-+	if (!directory_exist(fname,NULL)) {
-+		mkdir(fname,0755);
-+	}
-+
-+	pstrcat(fname,"/");
-+	pstrcat(fname,name);
-+
-+	return fname;
-+}
-+
-+/**
-  * @brief Returns the platform specific shared library extension.
-  *
-  * @retval Pointer to a static #fstring containing the extension.
 Index: samba-3.2.0pre1/source/lib/util_unistr.c
 ===================================================================
 --- samba-3.2.0pre1.orig/source/lib/util_unistr.c

Modified: branches/samba/experimental/debian/patches/fhs-newpaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-newpaths.patch	2007-10-21 04:50:13 UTC (rev 1535)
+++ branches/samba/experimental/debian/patches/fhs-newpaths.patch	2007-10-21 04:59:46 UTC (rev 1536)
@@ -141,3 +141,49 @@
 +
 +char *dyn_STATEDIR(void);
 +char *dyn_CACHEDIR(void);
+Index: samba-3.0.26a/source/lib/util.c
+===================================================================
+--- samba-3.0.26a.orig/source/lib/util.c
++++ samba-3.0.26a/source/lib/util.c
+@@ -2632,6 +2632,41 @@
+ }
+ 
+ /**
++ * @brief Returns an absolute path to a file in the Samba data directory.
++ *
++ * @param name File to find, relative to CODEPAGEDIR.
++ *
++ * @retval Pointer to a static #pstring containing the full path.
++ **/
++
++char *data_path(const char *name)
++{
++	static pstring fname;
++	snprintf(fname, sizeof(fname), "%s/%s", dyn_CODEPAGEDIR, name);
++	return fname;
++}
++
++/*****************************************************************
++a useful function for returning a path in the Samba state directory
++ *****************************************************************/
++char *state_path(char *name)
++{
++	static pstring fname;
++
++	pstrcpy(fname,dyn_STATEDIR());
++	trim_string(fname,"","/");
++
++	if (!directory_exist(fname,NULL)) {
++		mkdir(fname,0755);
++	}
++
++	pstrcat(fname,"/");
++	pstrcat(fname,name);
++
++	return fname;
++}
++
++/**
+  * @brief Returns the platform specific shared library extension.
+  *
+  * @retval Pointer to a static #fstring containing the extension.