summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-12-16 12:55:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:47:27 -0500
commit8a2385c933eda5e844739021d1e0c52e0fa06628 (patch)
treecb4ecfe7265e1b0314f1a04b90b58d9ed986cdaf /source4
parenta2013b16b91c53df10c4df04dfdd3dda184b7d33 (diff)
downloadsamba-8a2385c933eda5e844739021d1e0c52e0fa06628.tar.gz
samba-8a2385c933eda5e844739021d1e0c52e0fa06628.tar.bz2
samba-8a2385c933eda5e844739021d1e0c52e0fa06628.zip
r12287: move the wins.ldb into lockdir
metze (This used to be commit bcf04a49e329af6c2a72c0a9cf037cc4efeeb26f)
Diffstat (limited to 'source4')
-rw-r--r--source4/nbt_server/wins/winsdb.c4
-rwxr-xr-xsource4/script/tests/selftest.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c
index 3a73b9897c..8ed55dca1a 100644
--- a/source4/nbt_server/wins/winsdb.c
+++ b/source4/nbt_server/wins/winsdb.c
@@ -677,6 +677,6 @@ failed:
struct ldb_context *winsdb_connect(TALLOC_CTX *mem_ctx)
{
- return ldb_wrap_connect(mem_ctx, lp_wins_url(), system_session(mem_ctx),
- NULL, 0, NULL);
+ return ldb_wrap_connect(mem_ctx, lock_path(mem_ctx, lp_wins_url()),
+ system_session(mem_ctx), NULL, 0, NULL);
}
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh
index 95f2b3e767..adf5d082f8 100755
--- a/source4/script/tests/selftest.sh
+++ b/source4/script/tests/selftest.sh
@@ -85,7 +85,7 @@ export PATH
rm -rf $PREFIX/*
mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $TLSDIR
-cat >$PRIVATEDIR/wins.ldif<<EOF
+cat >$LOCKDIR/wins.ldif<<EOF
dn: name=TORTURE_26,CN=PARTNERS
objectClass: wreplPartner
name: TORTURE_26
@@ -156,7 +156,7 @@ echo -n "PROVISIONING..."
--quiet --domain $DOMAIN --realm $REALM \
--adminpass $PASSWORD --root=$ROOT || exit 1
-./bin/ldbadd -H $PRIVATEDIR/wins.ldb < $PRIVATEDIR/wins.ldif >/dev/null || exit 1
+./bin/ldbadd -H $LOCKDIR/wins.ldb < $LOCKDIR/wins.ldif >/dev/null || exit 1
echo "DONE"