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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2007-05-23 05:25:47 +0000 (Wed, 23 May 2007)
New Revision: 1400

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/fhs.patch
Log:
Recreate winbindd_cache.tdb in the cache directory and not the lock
directory when it is invalid. Closes: #425640


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-05-22 21:08:49 UTC (rev 1399)
+++ trunk/samba/debian/changelog	2007-05-23 05:25:47 UTC (rev 1400)
@@ -7,6 +7,10 @@
   * Merge Ubuntu changes:
     - use of PIDDIR instead of hardcoding it in samba.init and winbind.init
     - The default files permissions in [homes] is 0600 and not 0700
+  * Patches to upstream source:
+    - patches/fhs.patch: recreate winbindd_cache.tdb in the cache directory
+      instead of the lock directory. Thanks to C. K. Jester-Young for the
+      patch. Closes: #425640
 
  -- Christian Perrier <bubulle at debian.org>  Sat, 19 May 2007 09:00:56 +0200
 

Modified: trunk/samba/debian/patches/fhs.patch
===================================================================
--- trunk/samba/debian/patches/fhs.patch	2007-05-22 21:08:49 UTC (rev 1399)
+++ trunk/samba/debian/patches/fhs.patch	2007-05-23 05:25:47 UTC (rev 1400)
@@ -350,6 +350,18 @@
  				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
  				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
  				O_RDWR|O_CREAT, 0600);
+@@ -2223,9 +2223,9 @@
+                tdb_close(wcache->tdb);
+                wcache->tdb = NULL;
+
+-               if (unlink(lock_path("winbindd_cache.tdb")) == -1) {
++               if (unlink(cache_path("winbindd_cache.tdb")) == -1) {
+                        DEBUG(0,("initialize_winbindd_cache: unlink %s failed %s ",
+-                               lock_path("winbindd_cache.tdb"),
++                               cache_path("winbindd_cache.tdb"),
+                                strerror(errno) ));
+                        return False;
+                }
 Index: samba-3.0.25rc2/source/param/loadparm.c
 ===================================================================
 --- samba-3.0.25rc2.orig/source/param/loadparm.c	2007-04-24 11:07:02.358137523 +0200