summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-12-30 03:12:11 +0100
committerJeremy Allison <jra@samba.org>2007-12-29 21:38:39 -0800
commitdf450fc090071b3645ecede5d15685e68e209d99 (patch)
treeb870d3962562b963183a23afd7042cdb7a962083
parentd674b95357b34a89b915af68fa12aa6b4169198d (diff)
downloadsamba-df450fc090071b3645ecede5d15685e68e209d99.tar.gz
samba-df450fc090071b3645ecede5d15685e68e209d99.tar.bz2
samba-df450fc090071b3645ecede5d15685e68e209d99.zip
Make pdb_tdb honour a private dir overridden in smb.conf.
One lp_private_dir() has to be used instead of get_dyn_PRIVATE_DIR() to determine the location of the passdb.tdb. I noticed this when running make test as a "normal user" from a build, where I had done "make install" as root before, and so the passdb.tdb could not be accessed during the startup phase "CREATE TEST ENVIRONMENT IN ./st ..." in selftest.sh. Michael (This used to be commit 1f96389afa7250af7393489fb538b8aed93d815c)
-rw-r--r--source3/passdb/pdb_tdb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 5e21c46abf..5ee1cdc0c0 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -1613,7 +1613,7 @@ static NTSTATUS pdb_init_tdbsam(struct pdb_methods **pdb_method, const char *loc
/* save the path for later */
if (!location) {
- if (asprintf(&tdbfile, "%s/%s", get_dyn_PRIVATE_DIR(),
+ if (asprintf(&tdbfile, "%s/%s", lp_private_dir(),
PASSDB_FILE_NAME) < 0) {
return NT_STATUS_NO_MEMORY;
}