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/param/secrets.c | |
| 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/param/secrets.c')
| -rw-r--r-- | source4/param/secrets.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/param/secrets.c b/source4/param/secrets.c index 4107526d75..829341a5f9 100644 --- a/source4/param/secrets.c +++ b/source4/param/secrets.c @@ -108,7 +108,7 @@ struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx) return NULL; } - path = private_path(mem_ctx, url); + path = private_path(mem_ctx, global_loadparm, url); if (!path) { return NULL; } @@ -117,7 +117,7 @@ struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx) /* Secrets.ldb *must* always be local. If we call for a * system_session() we will recurse */ - ldb = ldb_wrap_connect(mem_ctx, path, NULL, NULL, 0, NULL); + ldb = ldb_wrap_connect(mem_ctx, global_loadparm, path, NULL, NULL, 0, NULL); talloc_free(path); if (!ldb) { return NULL; |