diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-10-01 18:52:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:34 -0500 |
| commit | 2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad (patch) | |
| tree | 2d02f6e998c150cca5323e574ffb8094fffc288f /source4/ntptr | |
| parent | 4d7273715f109db82a4ee4852855927a32bb4073 (diff) | |
| download | samba-2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad.tar.gz samba-2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad.tar.bz2 samba-2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad.zip | |
r25446: Merge some changes I made on the way home from SFO:
2007-09-29 More higher-level passing around of lp_ctx.
2007-09-29 Fix warning.
2007-09-29 Pass loadparm contexts on a higher level.
2007-09-29 Avoid using global loadparm context.
(This used to be commit 3468952e771ab31f90b6c374ade01c5550810f42)
Diffstat (limited to 'source4/ntptr')
| -rw-r--r-- | source4/ntptr/ntptr_base.c | 2 | ||||
| -rw-r--r-- | source4/ntptr/simple_ldb/ntptr_simple_ldb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c index 5735dbe936..379c4e5413 100644 --- a/source4/ntptr/ntptr_base.c +++ b/source4/ntptr/ntptr_base.c @@ -72,7 +72,7 @@ NTSTATUS ntptr_register(const void *_ops) NTSTATUS ntptr_init(void) { init_module_fn static_init[] = STATIC_ntptr_MODULES; - init_module_fn *shared_init = load_samba_modules(NULL, "ntptr"); + init_module_fn *shared_init = load_samba_modules(NULL, global_loadparm, "ntptr"); run_init_functions(static_init); run_init_functions(shared_init); diff --git a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c index 02808bfbc8..4046c1bdbd 100644 --- a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c +++ b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c @@ -43,7 +43,7 @@ */ static struct ldb_context *sptr_db_connect(TALLOC_CTX *mem_ctx) { - return ldb_wrap_connect(mem_ctx, lp_spoolss_url(global_loadparm), system_session(mem_ctx), + return ldb_wrap_connect(mem_ctx, global_loadparm, lp_spoolss_url(global_loadparm), system_session(mem_ctx), NULL, 0, NULL); } |