From 88ee61625a5de5e443d14c54eab91a90d87cda85 Mon Sep 17 00:00:00 2001 From: "Gerald (Jerry) Carter" Date: Thu, 1 Nov 2007 15:53:44 -0400 Subject: Patch 2 of 3 from Debian Samba packagers: The point is doing the following associations: - non discardable state data (all TDB files that may need to be backed up) go to statedir - shared data (codepage stuff) go to codepagedir The patch *does not change* the default location for these directories. So, there is no behaviour change when applying it. The main change is for samba developers who have to think when dealing with files that previously pertained to libdir whether they: - go in statedir - go in codepagedir - stay in libdir (This used to be commit d6cdbfd875bb2653e831d314726c3240beb0a96b) --- source3/param/loadparm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/param/loadparm.c') diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index a5b2647567..e59aa99048 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1696,7 +1696,7 @@ static void init_globals(bool first_time_only) Globals.bASUSupport = False; /* User defined shares. */ - pstrcpy(s, dyn_LOCKDIR); + pstrcpy(s, dyn_STATEDIR()); pstrcat(s, "/usershares"); string_set(&Globals.szUsersharePath, s); string_set(&Globals.szUsershareTemplateShare, ""); @@ -3340,12 +3340,12 @@ static struct tdb_wrap *lp_regdb_open(void) uint32 vers_id; become_root(); - reg_tdb = tdb_wrap_open(NULL, lock_path("registry.tdb"), 0, + reg_tdb = tdb_wrap_open(NULL, state_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR, 0600); unbecome_root(); if (!reg_tdb) { DEBUG(1, ("lp_regdb_open: failed to open %s: %s\n", - lock_path("registry.tdb"), strerror(errno))); + state_path("registry.tdb"), strerror(errno))); goto done; } else { @@ -3356,7 +3356,7 @@ static struct tdb_wrap *lp_regdb_open(void) if (vers_id != REGVER_V1) { DEBUG(10, ("lp_regdb_open: INFO: registry tdb %s has wrong " "INFO/version (got %d, expected %d)\n", - lock_path("registry.tdb"), vers_id, REGVER_V1)); + state_path("registry.tdb"), vers_id, REGVER_V1)); /* this is apparently not implemented in the tdb */ } -- cgit