diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-12 23:01:08 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-13 14:06:07 +0200 |
| commit | 01c934c81e55b79601122d8e0740c7946077c37e (patch) | |
| tree | f6e7909690bc399c3036ef80e22997aadbf88884 /source3/lib/serverid.c | |
| parent | 3cdb1fe4404e26ae383cfb73bfa8af36cb1d7f7c (diff) | |
| download | samba-01c934c81e55b79601122d8e0740c7946077c37e.tar.gz samba-01c934c81e55b79601122d8e0740c7946077c37e.tar.bz2 samba-01c934c81e55b79601122d8e0740c7946077c37e.zip | |
lib/util: Add back control of mmap and hash size in tdb for top level build
This passes down a struct loadparm_context to allow these
parameters to be checked. This may be s3 or s4 context, allowing the
#if _SAMBA_BUILD_ macro to go away safely.
Andrew Bartlett
Diffstat (limited to 'source3/lib/serverid.c')
| -rw-r--r-- | source3/lib/serverid.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c index 151d1d605d..b3b294f893 100644 --- a/source3/lib/serverid.c +++ b/source3/lib/serverid.c @@ -24,6 +24,7 @@ #include "dbwrap/dbwrap.h" #include "dbwrap/dbwrap_open.h" #include "lib/util/tdb_wrap.h" +#include "lib/param/param.h" struct serverid_key { pid_t pid; @@ -39,6 +40,13 @@ struct serverid_data { bool serverid_parent_init(TALLOC_CTX *mem_ctx) { struct tdb_wrap *db; + struct loadparm_context *lp_ctx; + + lp_ctx = loadparm_init_s3(mem_ctx, loadparm_s3_context()); + if (lp_ctx == NULL) { + DEBUG(0, ("loadparm_init_s3 failed\n")); + return false; + } /* * Open the tdb in the parent process (smbd) so that our @@ -48,7 +56,8 @@ bool serverid_parent_init(TALLOC_CTX *mem_ctx) db = tdb_wrap_open(mem_ctx, lock_path("serverid.tdb"), 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, O_RDWR|O_CREAT, - 0644); + 0644, lp_ctx); + talloc_unlink(mem_ctx, lp_ctx); if (db == NULL) { DEBUG(1, ("could not open serverid.tdb: %s\n", strerror(errno))); |