diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-18 22:30:04 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-19 05:38:05 +0200 |
| commit | 6244f668a34279e6da62213333dfb32c3ccdb17d (patch) | |
| tree | 0dd495f4d03e57e8a5710d2edea84c137d4b4aee /source3/smbd | |
| parent | 5bad913938daca4ae3020653690701db83826954 (diff) | |
| download | samba-6244f668a34279e6da62213333dfb32c3ccdb17d.tar.gz samba-6244f668a34279e6da62213333dfb32c3ccdb17d.tar.bz2 samba-6244f668a34279e6da62213333dfb32c3ccdb17d.zip | |
TDB2: make SAMBA use tdb1 again for the moment.
Otherwise the following surgery will break the SAMBA build and testsuite.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/mangle_hash.c | 5 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c index 0238083e38..8b1b6bf915 100644 --- a/source3/smbd/mangle_hash.c +++ b/source3/smbd/mangle_hash.c @@ -764,13 +764,8 @@ const struct mangle_fns *mangle_hash_init(void) mangle_reset(); /* Create the in-memory tdb using our custom hash function. */ -#ifndef BUILD_TDB2 tdb_mangled_cache = tdb_open_ex("mangled_cache", 1031, TDB_INTERNAL, (O_RDWR|O_CREAT), 0644, NULL, fast_string_hash); -#else - /* FIXME: We should *never* open a tdb without logging! */ - tdb_mangled_cache = tdb_open("mangled_cache", TDB_INTERNAL, 0, 0, NULL); -#endif return &mangle_hash_fns; } diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 4d035179c5..8196e69634 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -1047,13 +1047,8 @@ void smbd_send_stat_cache_delete_message(struct messaging_context *msg_ctx, void send_stat_cache_delete_message(struct messaging_context *msg_ctx, const char *name); void stat_cache_delete(const char *name); -#if BUILD_TDB2 -struct tdb_data; -unsigned int fast_string_hash(struct tdb_data *key); -#else struct TDB_DATA; unsigned int fast_string_hash(struct TDB_DATA *key); -#endif bool reset_stat_cache( void ); /* The following definitions come from smbd/statvfs.c */ |