Author: idra Date: 2007-06-06 16:13:14 +0000 (Wed, 06 Jun 2007) New Revision: 23369
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23369 Log: Fix an fhs.patch bug that causes winbind to refuse to start if it needs to recreate the winbindd_cache.tdb file Modified: branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/changelog branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/fhs.patch Changeset: Modified: branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/changelog =================================================================== --- branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/changelog 2007-06-06 13:02:24 UTC (rev 23368) +++ branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/changelog 2007-06-06 16:13:14 UTC (rev 23369) @@ -1,3 +1,9 @@ +samba (3.0.25a-2) stable; urgency=low + + * Fix bug in fhs.patch + + -- Simo Sorce <[EMAIL PROTECTED]> Wed, 6 Jun 2007 11:33:30 -0400 + samba (3.0.25a-1) stable; urgency=high * samba 3.0.25a Stabilizing release Modified: branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/fhs.patch =================================================================== --- branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/fhs.patch 2007-06-06 13:02:24 UTC (rev 23368) +++ branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/fhs.patch 2007-06-06 16:13:14 UTC (rev 23369) @@ -261,6 +261,27 @@ WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 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; + } +@@ -2487,7 +2487,7 @@ + return; + + /* when working offline we must not clear the cache on restart */ +- wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), ++ wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), + WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, + lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), + O_RDWR|O_CREAT, 0600); diff -uNr samba-3.0.10.orig/source/param/loadparm.c samba-3.0.10/source/param/loadparm.c --- samba-3.0.10.orig/source/param/loadparm.c 2004-12-17 03:50:09.000000000 -0800 +++ samba-3.0.10/source/param/loadparm.c 2004-12-17 03:55:30.000000000 -0800
