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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-07-22 00:39:25 +0000 (Tue, 22 Jul 2008)
New Revision: 2065

Modified:
   trunk/samba/
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/fhs-filespaths.patch
Log:
* Brown paper bag bug: add a change to debian/patches/fhs-filespaths.patch
  that went missing somehow, causing samba to look for secrets.tdb in
  /etc/samba instead of /var/lib/samba where it's been for years.  No
  migration handling added, because this was only present in unstable for
  about a day.  Thanks to Rick Nelson for pointing this out.


Property changes on: trunk/samba
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2007-11-12 13:56:56.803999901 -0800
committer: Steve Langasek <steve.langasek at canonical.com>
properties: 
	branch-nick: samba.deb

   + timestamp: 2008-07-21 16:29:50.638999939 -0700
committer: Steve Langasek <vorlon at debian.org>
properties: 
	branch-nick: samba.deb

Name: bzr:file-ids
   - debian/patches/usershare.patch	usershare.patch-20071111022404-m4t5puq5wxrkqa1p-1
debian/patches/get_global_sam_sid-non-root.patch	get_global_sam_sidno-20071111002251-yyz8h314qolu25gg-1

   + 
Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWTAzeBkAAA5RgAAQABC6yR4AIAAxTAAA0nqA9RtJaDAREhvTa9c1PHSHfi7kinChIGBm8DI.
   + 332 vorlon at debian.org-20080721232950-4j05wu8r6shw8swy


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2008-07-20 23:11:59 UTC (rev 2064)
+++ trunk/samba/debian/changelog	2008-07-22 00:39:25 UTC (rev 2065)
@@ -1,8 +1,12 @@
 samba (2:3.2.0-4) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * Brown paper bag bug: add a change to debian/patches/fhs-filespaths.patch
+    that went missing somehow, causing samba to look for secrets.tdb in
+    /etc/samba instead of /var/lib/samba where it's been for years.  No
+    migration handling added, because this was only present in unstable for
+    about a day.  Thanks to Rick Nelson for pointing this out.
 
- -- Steve Langasek <vorlon at debian.org>  Sun, 20 Jul 2008 16:10:31 -0700
+ -- Steve Langasek <vorlon at debian.org>  Mon, 21 Jul 2008 15:12:03 -0700
 
 samba (2:3.2.0-3) unstable; urgency=low
 

Modified: trunk/samba/debian/patches/fhs-filespaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-filespaths.patch	2008-07-20 23:11:59 UTC (rev 2064)
+++ trunk/samba/debian/patches/fhs-filespaths.patch	2008-07-22 00:39:25 UTC (rev 2065)
@@ -50,10 +50,10 @@
       grep -r lp_lockdir source/ | grep -vE \
          '%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm|smbd/oplock_irix)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
 
-Index: samba-3.2.0/source/passdb/pdb_tdb.c
+Index: b/source/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.2.0.orig/source/passdb/pdb_tdb.c
-+++ samba-3.2.0/source/passdb/pdb_tdb.c
+--- a/source/passdb/pdb_tdb.c
++++ b/source/passdb/pdb_tdb.c
 @@ -1612,7 +1612,7 @@
  	/* save the path for later */
  
@@ -63,10 +63,10 @@
  			     PASSDB_FILE_NAME) < 0) {
  			return NT_STATUS_NO_MEMORY;
  		}
-Index: samba-3.2.0/source/modules/vfs_xattr_tdb.c
+Index: b/source/modules/vfs_xattr_tdb.c
 ===================================================================
---- samba-3.2.0.orig/source/modules/vfs_xattr_tdb.c
-+++ samba-3.2.0/source/modules/vfs_xattr_tdb.c
+--- a/source/modules/vfs_xattr_tdb.c
++++ b/source/modules/vfs_xattr_tdb.c
 @@ -576,7 +576,7 @@
  	const char *dbname;
  
@@ -76,10 +76,19 @@
  
  	if (dbname == NULL) {
  		errno = ENOSYS;
-Index: samba-3.2.0/source/passdb/secrets.c
+Index: b/source/passdb/secrets.c
 ===================================================================
---- samba-3.2.0.orig/source/passdb/secrets.c
-+++ samba-3.2.0/source/passdb/secrets.c
+--- a/source/passdb/secrets.c
++++ b/source/passdb/secrets.c
+@@ -59,7 +59,7 @@
+ 		return True;
+ 
+ 	fname = talloc_asprintf(talloc_tos(), "%s/secrets.tdb",
+-				lp_private_dir());
++				get_dyn_STATEDIR());
+ 	if (fname == NULL) {
+ 		return false;
+ 	}
 @@ -1112,7 +1112,7 @@
  	TDB_DATA vers;
  	uint32 ver;