r25446: Merge some changes I made on the way home from SFO:

[bbaumbach/samba-autobuild/.git] / source4 / lib / db_wrap.c

diff --git a/source4/lib/db_wrap.c b/source4/lib/db_wrap.c
index 4c0a06cf2c8b01d9f9341c3b86b688cc5c61ec4a..c33786a1e43a8c0b83b8259c9972357e23ff33d6 100644 (file)
--- a/source4/lib/db_wrap.c
+++ b/source4/lib/db_wrap.c
@@ -103,6 +103,7 @@ static int ldb_wrap_destructor(struct ldb_context *ldb)
   TODO:  We need an error_string parameter
  */
 struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
+                                    struct loadparm_context *lp_ctx,
                                     const char *url,
                                     struct auth_session_info *session_info,
                                     struct cli_credentials *credentials,
@@ -121,7 +122,7 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
        }
 
        ldb_set_modules_dir(ldb, 
-                           talloc_asprintf(ldb, "%s/ldb", lp_modulesdir(global_loadparm)));
+                           talloc_asprintf(ldb, "%s/ldb", lp_modulesdir(lp_ctx)));
 
        /* we want to use the existing event context if possible. This
           relies on the fact that in smbd, everything is a child of
@@ -143,7 +144,7 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
                return NULL;
        }
        
-       if (strcmp(lp_sam_url(global_loadparm), url) == 0) {
+       if (strcmp(lp_sam_url(lp_ctx), url) == 0) {
                dsdb_set_global_schema(ldb);
        }
 
@@ -157,14 +158,14 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
 
        ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
 
-       real_url = private_path(ldb, url);
+       real_url = private_path(ldb, lp_ctx, url);
        if (real_url == NULL) {
                talloc_free(ldb);
                return NULL;
        }
 
        /* allow admins to force non-sync ldb for all databases */
-       if (lp_parm_bool(global_loadparm, NULL, "ldb", "nosync", false)) {
+       if (lp_parm_bool(lp_ctx, NULL, "ldb", "nosync", false)) {
                flags |= LDB_FLG_NOSYNC;
        }