From 3276060da4e7d495bd5cf5cbf7237e64d948ee77 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 24 Jun 2011 10:15:02 +0200 Subject: 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 Autobuild-Date: Wed Jul 27 05:37:57 CEST 2011 on sn-devel-104 --- source3/winbindd/idmap_tdb2.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'source3/winbindd') 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 */ -- cgit