summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2013-04-11 17:12:16 +0930
committerJeremy Allison <jra@samba.org>2013-04-13 02:01:02 +0200
commit41333f92d0c78e44a524f2248f5ae641ad59abf3 (patch)
tree7c66421c6c6056b14c2596ce1761784de60a9094 /lib
parented6a4e04e1f8a0ca952e37577bfdc9731d6ef93d (diff)
downloadsamba-41333f92d0c78e44a524f2248f5ae641ad59abf3.tar.gz
samba-41333f92d0c78e44a524f2248f5ae641ad59abf3.tar.bz2
samba-41333f92d0c78e44a524f2248f5ae641ad59abf3.zip
ntdb: remove --disable-ntdb.
Remove DISABLE_NTDB option, and --disable-ntdb from waf build. This just means that it will always get built: it isn't used by default yet. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Sat Apr 13 02:01:02 CEST 2013 on sn-devel-104
Diffstat (limited to 'lib')
-rw-r--r--lib/dbwrap/dbwrap_local_open.c8
-rw-r--r--lib/param/util.c2
2 files changed, 0 insertions, 10 deletions
diff --git a/lib/dbwrap/dbwrap_local_open.c b/lib/dbwrap/dbwrap_local_open.c
index c2eb7b73ee..56048afa84 100644
--- a/lib/dbwrap/dbwrap_local_open.c
+++ b/lib/dbwrap/dbwrap_local_open.c
@@ -23,14 +23,11 @@
#include "dbwrap/dbwrap_tdb.h"
#include "dbwrap/dbwrap_ntdb.h"
#include "tdb.h"
-#ifndef DISABLE_NTDB
#include "lib/util/util_ntdb.h"
-#endif
#include "lib/param/param.h"
#include "system/filesys.h"
#include "ccan/str/str.h"
-#ifndef DISABLE_NTDB
struct flag_map {
int tdb_flag;
int ntdb_flag;
@@ -157,7 +154,6 @@ static bool tdb_to_ntdb(TALLOC_CTX *ctx, struct loadparm_context *lp_ctx,
ntdbname, tdbbase, bakbase));
return true;
}
-#endif /* !DISABLE_NTDB */
struct db_context *dbwrap_local_open(TALLOC_CTX *mem_ctx,
struct loadparm_context *lp_ctx,
@@ -196,9 +192,6 @@ struct db_context *dbwrap_local_open(TALLOC_CTX *mem_ctx,
}
if (name == ntdbname) {
-#ifdef DISABLE_NTDB
- DEBUG(1, ("WARNING: no ntdb support to open '%s'\n", name));
-#else
int ntdb_flags = tdb_flags_to_ntdb_flags(tdb_flags);
/* For non-internal databases, we upgrade on demand. */
@@ -212,7 +205,6 @@ struct db_context *dbwrap_local_open(TALLOC_CTX *mem_ctx,
}
db = db_open_ntdb(mem_ctx, lp_ctx, ntdbname, hash_size,
ntdb_flags, open_flags, mode, lock_order);
-#endif
} else {
if (!streq(ntdbname, tdbname) && file_exist(ntdbname)) {
DEBUG(0, ("Refusing to open '%s' when '%s' exists\n",
diff --git a/lib/param/util.c b/lib/param/util.c
index 29266c493d..8c3badfcb9 100644
--- a/lib/param/util.c
+++ b/lib/param/util.c
@@ -206,11 +206,9 @@ char *lpcfg_private_db_path(TALLOC_CTX *mem_ctx,
{
const char *extension = ".tdb";
-#ifndef DISABLE_NTDB
if (lpcfg_use_ntdb(lp_ctx)) {
extension = ".ntdb";
}
-#endif
return talloc_asprintf(mem_ctx, "%s/%s%s",
lpcfg_private_dir(lp_ctx), name, extension);