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

[vorlon at alioth.debian.org]

tags 454770 pending
thanks

Author: vorlon
Date: 2008-07-20 22:30:49 +0000 (Sun, 20 Jul 2008)
New Revision: 2059

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/fhs-filespaths.patch
   trunk/samba/debian/samba.postinst
Log:
Move schannel_store.tdb out of /etc/samba to /var/lib/samba, where it
belongs according to the FHS.  Closes: #454770.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2008-07-20 20:29:48 UTC (rev 2058)
+++ trunk/samba/debian/changelog	2008-07-20 22:30:49 UTC (rev 2059)
@@ -11,6 +11,8 @@
   * Bump the shlibs version for libsmbclient to 2:3.2.0, as new symbols
     have been added.
   * Re-add docs/registry to samba-doc, restored upstream
+  * Move schannel_store.tdb out of /etc/samba to /var/lib/samba, where it
+    belongs according to the FHS.  Closes: #454770.
 
  -- Steve Langasek <vorlon at debian.org>  Tue, 15 Jul 2008 12:33:54 +0100
 

Modified: trunk/samba/debian/patches/fhs-filespaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-filespaths.patch	2008-07-20 20:29:48 UTC (rev 2058)
+++ trunk/samba/debian/patches/fhs-filespaths.patch	2008-07-20 22:30:49 UTC (rev 2059)
@@ -7,7 +7,7 @@
 
 Status wrt upstream: This is a greatly reduced patch; most of the
                      changes are already accepted upstream in 3.2, only
-                     two bits remain: one needs further analysis because
+                     three bits remain: two need further analysis because
                      Debian use of lp_private_dir() differs from that on
                      other distros, the other is a newly-introduced tdb
                      that went in the wrong dir
@@ -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.0rc1/source/passdb/pdb_tdb.c
+Index: samba-3.2.0/source/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.2.0rc1.orig/source/passdb/pdb_tdb.c
-+++ samba-3.2.0rc1/source/passdb/pdb_tdb.c
+--- samba-3.2.0.orig/source/passdb/pdb_tdb.c
++++ samba-3.2.0/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.0rc1/source/modules/vfs_xattr_tdb.c
+Index: samba-3.2.0/source/modules/vfs_xattr_tdb.c
 ===================================================================
---- samba-3.2.0rc1.orig/source/modules/vfs_xattr_tdb.c
-+++ samba-3.2.0rc1/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
 @@ -576,7 +576,7 @@
  	const char *dbname;
  
@@ -76,3 +76,16 @@
  
  	if (dbname == NULL) {
  		errno = ENOSYS;
+Index: samba-3.2.0/source/passdb/secrets.c
+===================================================================
+--- samba-3.2.0.orig/source/passdb/secrets.c
++++ samba-3.2.0/source/passdb/secrets.c
+@@ -1112,7 +1112,7 @@
+ 	TDB_DATA vers;
+ 	uint32 ver;
+ 	TDB_CONTEXT *tdb_sc = NULL;
+-	char *fname = talloc_asprintf(mem_ctx, "%s/schannel_store.tdb", lp_private_dir());
++	char *fname = talloc_asprintf(mem_ctx, "%s/schannel_store.tdb", get_dyn_STATEDIR());
+ 
+ 	if (!fname) {
+ 		return NULL;

Modified: trunk/samba/debian/samba.postinst
===================================================================
--- trunk/samba/debian/samba.postinst	2008-07-20 20:29:48 UTC (rev 2058)
+++ trunk/samba/debian/samba.postinst	2008-07-20 22:30:49 UTC (rev 2059)
@@ -91,6 +91,13 @@
 	mv /var/run/samba/share_info.tdb /var/lib/samba/share_info.tdb
 fi
 
+if dpkg --compare-versions "$2" lt-nl 2:3.2.0-3 \
+   && dpkg --compare-versions "$2" ge 3.0.24 \
+   && [ -e /etc/samba/schannel_store.tdb ] \
+   && ! [ -e /var/lib/samba/schannel_store.tdb ]
+then
+	mv /etc/samba/schannel_store.tdb /var/lib/samba/schannel_store.tdb
+fi
 
 # We want to add these entries to inetd.conf commented out. Otherwise
 #	UDP traffic could make inetd to start nmbd or smbd right during