summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-02-21 11:03:35 -0800
committerJeremy Allison <jra@samba.org>2008-02-21 11:03:35 -0800
commit5df1d8d550d66b1e52219bd15d24af5146c55ceb (patch)
tree7d8398a2861e2736666d21273df6c17ac7c4bb57
parent3a376f1cfa25f79eab8f41a42383f1bd982830ff (diff)
parent7428f00d22ea0b006fd2c69d6533b534f8e41381 (diff)
downloadsamba-5df1d8d550d66b1e52219bd15d24af5146c55ceb.tar.gz
samba-5df1d8d550d66b1e52219bd15d24af5146c55ceb.tar.bz2
samba-5df1d8d550d66b1e52219bd15d24af5146c55ceb.zip
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 9dabde1f3e5ba3d98e4e02d8c2a0706dc4f48c18)
-rw-r--r--source3/modules/vfs_xattr_tdb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c
index 171022b01b..0a92d5c591 100644
--- a/source3/modules/vfs_xattr_tdb.c
+++ b/source3/modules/vfs_xattr_tdb.c
@@ -575,7 +575,7 @@ static bool xattr_tdb_init(int snum, struct db_context **p_db)
struct db_context *db;
const char *dbname;
- dbname = lp_parm_const_string(snum, "xattr", "tdb",
+ dbname = lp_parm_const_string(snum, "xattr_tdb", "file",
lock_path("xattr.tdb"));
if (dbname == NULL) {