From 2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 1 Oct 2007 18:52:55 +0000
Subject: 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)
---
 source4/lib/registry/ldb.c   | 10 ++++++----
 source4/lib/registry/samba.c | 10 +++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'source4/lib/registry')

diff --git a/source4/lib/registry/ldb.c b/source4/lib/registry/ldb.c
index 5ecbfa0407..e9daf31f9b 100644
--- a/source4/lib/registry/ldb.c
+++ b/source4/lib/registry/ldb.c
@@ -23,6 +23,7 @@
 #include "lib/ldb/include/ldb_errors.h"
 #include "db_wrap.h"
 #include "librpc/gen_ndr/winreg.h"
+#include "param/param.h"
 
 static struct hive_operations reg_backend_ldb;
 
@@ -317,9 +318,9 @@ static WERROR ldb_open_key(TALLOC_CTX *mem_ctx, const struct hive_key *h,
 }
 
 WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location, 
-								struct auth_session_info *session_info,
-								struct cli_credentials *credentials,
-								struct hive_key **k)
+			 struct auth_session_info *session_info,
+			 struct cli_credentials *credentials,
+			 struct hive_key **k)
 {
 	struct ldb_key_data *kd;
 	struct ldb_context *wrap;
@@ -327,7 +328,8 @@ WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location,
 	if (location == NULL) 
 		return WERR_INVALID_PARAM;
 
-	wrap = ldb_wrap_connect(parent_ctx, location, session_info, credentials, 0, NULL);
+	wrap = ldb_wrap_connect(parent_ctx, global_loadparm, 
+				location, session_info, credentials, 0, NULL);
 
 	if (wrap == NULL) {
 		DEBUG(1, (__FILE__": unable to connect\n"));
diff --git a/source4/lib/registry/samba.c b/source4/lib/registry/samba.c
index 48eb043306..18bbcb8299 100644
--- a/source4/lib/registry/samba.c
+++ b/source4/lib/registry/samba.c
@@ -25,11 +25,11 @@
  * @brief Samba-specific registry functions
  */
 
-static WERROR mount_samba_hive(struct registry_context *ctx,
-						struct auth_session_info *auth_info,
-						struct cli_credentials *creds,
-						const char *name, 
-						uint32_t hive_id)
+static WERROR mount_samba_hive(struct registry_context *ctx, 
+			       struct auth_session_info *auth_info,
+			       struct cli_credentials *creds,
+			       const char *name, 
+			       uint32_t hive_id)
 {
 	WERROR error;
 	struct hive_key *hive;
-- 
cgit