summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-06-24 10:15:02 +0200
committerMichael Adam <obnox@samba.org>2011-07-27 05:37:57 +0200
commit3276060da4e7d495bd5cf5cbf7237e64d948ee77 (patch)
treead8cb94c6bf51c38f717165bf6451b082facab3e
parent67cd2f9d867fad1f7df2d6a6a5cdb723336ac495 (diff)
downloadsamba-3276060da4e7d495bd5cf5cbf7237e64d948ee77.tar.gz
samba-3276060da4e7d495bd5cf5cbf7237e64d948ee77.tar.bz2
samba-3276060da4e7d495bd5cf5cbf7237e64d948ee77.zip
s3:idmap_tdb2: remove the undocumented option of the silly name "tdb:idmap2.tdb"
In ancient times, when ctdb had not support for persistent databases and tdb2 was introduced as a two-layer solution and it was more important than today to be able to change the location of the permanent database file because it had to reside on shared storage. But these were times when idmap_tdb2 was not even officially released. Nowadays, with ctdb handling the persistent idmap2.tdb database, the path is stripped anyways, so this undocumented option has become unnecessary and is hence removed. Autobuild-User: Michael Adam <obnox@samba.org> Autobuild-Date: Wed Jul 27 05:37:57 CEST 2011 on sn-devel-104
-rw-r--r--source3/winbindd/idmap_tdb2.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index 723afbc01f..112978bdc3 100644
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -108,11 +108,7 @@ static NTSTATUS idmap_tdb2_open_db(struct idmap_domain *dom)
return NT_STATUS_OK;
}
- db_path = lp_parm_talloc_string(-1, "tdb", "idmap2.tdb", NULL);
- if (db_path == NULL) {
- /* fall back to the private directory */
- db_path = talloc_asprintf(NULL, "%s/idmap2.tdb", lp_private_dir());
- }
+ db_path = talloc_asprintf(NULL, "%s/idmap2.tdb", lp_private_dir());
NT_STATUS_HAVE_NO_MEMORY(db_path);
/* Open idmap repository */