[Pkg-samba-maint] r4071 - in trunk/samba/debian: . patches

[bubulle at alioth.debian.org]

tags 249873 pending
thanks

Author: bubulle
Date: 2012-05-08 21:21:24 +0000 (Tue, 08 May 2012)
New Revision: 4071

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/fhs-filespaths.patch
Log:
Use lp_state_dir() instead of get_dyn_STATEDIR() in
fhs-filespaths.patch as the latter does indeed hardcode the
location for passdb.tdb and secrets.tdb to /var/lib/samba
(the compile-time option for state directory and NOT the configurable
value). This is left to "state directory" instead of "private dir"
at least as of now, because if doesn't change anything to the
current behaviour, but allows the files' location to be configurable
through "state directory" (and not "private dir").
Closes: #249873


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-05-08 19:54:47 UTC (rev 4070)
+++ trunk/samba/debian/changelog	2012-05-08 21:21:24 UTC (rev 4071)
@@ -13,6 +13,16 @@
     documentation summary file. Do not compress that file.
   * Fix link to WHATSNEW.txt in HTML documentation summary file. This
     is the second part of the fix for #604768
+  * Use lp_state_dir() instead of get_dyn_STATEDIR() in
+    fhs-filespaths.patch as the latter does indeed hardcode the
+    location for passdb.tdb and secrets.tdb to /var/lib/samba
+    (the compile-time option for state directory and NOT the configurable
+    value). This is left to "state directory" instead of "private dir"
+    at least as of now, because if doesn't change anything to the
+    current behaviour, but allows the files' location to be configurable
+    through "state directory" (and not "private dir").
+    Closes: #249873
+  
 
  -- Christian Perrier <bubulle at debian.org>  Mon, 07 May 2012 22:16:32 +0200
 

Modified: trunk/samba/debian/patches/fhs-filespaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-filespaths.patch	2012-05-08 19:54:47 UTC (rev 4070)
+++ trunk/samba/debian/patches/fhs-filespaths.patch	2012-05-08 21:21:24 UTC (rev 4071)
@@ -13,29 +13,53 @@
 Forwarded: not-needed
 
 
-Index: experimental/source3/passdb/pdb_tdb.c
+Index: samba/source3/passdb/pdb_tdb.c
 ===================================================================
---- experimental.orig/source3/passdb/pdb_tdb.c
-+++ experimental/source3/passdb/pdb_tdb.c
-@@ -1255,7 +1255,7 @@
+--- samba.orig/source3/passdb/pdb_tdb.c
++++ samba/source3/passdb/pdb_tdb.c
+@@ -1260,7 +1260,7 @@
  	/* save the path for later */
  
  	if (!location) {
 -		if (asprintf(&tdbfile, "%s/%s", lp_private_dir(),
-+		if (asprintf(&tdbfile, "%s/%s", get_dyn_STATEDIR(),
++		if (asprintf(&tdbfile, "%s/%s", lp_statedir(),
  			     PASSDB_FILE_NAME) < 0) {
  			return NT_STATUS_NO_MEMORY;
  		}
-Index: experimental/source3/passdb/secrets.c
+Index: samba/source3/passdb/secrets.c
 ===================================================================
---- experimental.orig/source3/passdb/secrets.c
-+++ experimental/source3/passdb/secrets.c
-@@ -61,7 +61,7 @@
+--- samba.orig/source3/passdb/secrets.c
++++ samba/source3/passdb/secrets.c
+@@ -64,7 +64,7 @@
  		return True;
  
  	fname = talloc_asprintf(talloc_tos(), "%s/secrets.tdb",
 -				lp_private_dir());
-+				get_dyn_STATEDIR());
++				lp_statedir());
  	if (fname == NULL) {
  		return false;
  	}
+Index: samba/docs/manpages/smb.conf.5
+===================================================================
+--- samba.orig/docs/manpages/smb.conf.5
++++ samba/docs/manpages/smb.conf.5
+@@ -7167,7 +7167,7 @@
+ .\}
+ tdbsam
+ \- The TDB based password storage backend\&. Takes a path to the TDB as an optional argument (defaults to passdb\&.tdb in the
+-\m[blue]\fBprivate dir\fR\m[]
++\m[blue]\fBstate directory\fR\m[]
+ directory\&.
+ .RE
+ .sp
+@@ -8038,9 +8038,7 @@
+ .PP
+ .RS 4
+ This parameters defines the directory smbd will use for storing such files as
+-smbpasswd
+-and
+-secrets\&.tdb\&.
++smbpasswd\&. secrets\&.tdb is stored in state directory on Debian systems\&.
+ .sp
+ Default:
+ \fI\fIprivate dir\fR\fR\fI = \fR\fI${prefix}/private\fR\fI \fR