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)

7 files changed, 15 insertions, 12 deletions

diff --git a/source4/auth/auth.c b/source4/auth/auth.c
index 7a3f9f82cb..20524b34a4 100644
--- a/source4/auth/auth.c
+++ b/source4/auth/auth.c
@@ -519,7 +519,7 @@ NTSTATUS auth_init(void)
 	if (initialized) return NT_STATUS_OK;
 	initialized = True;
 	
-	shared_init = load_samba_modules(NULL, "auth");
+	shared_init = load_samba_modules(NULL, global_loadparm, "auth");
 
 	run_init_functions(static_init);
 	run_init_functions(shared_init);
diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c
index be8225f0dc..da1ffb5c85 100644
--- a/source4/auth/auth_sam.c
+++ b/source4/auth/auth_sam.c
@@ -342,14 +342,16 @@ static NTSTATUS authsam_want_check(struct auth_method_context *ctx,
 				   TALLOC_CTX *mem_ctx,
 				   const struct auth_usersupplied_info *user_info)
 {
-	BOOL is_local_name, is_my_domain;
+	bool is_local_name, is_my_domain;
 
 	if (!user_info->mapped.account_name || !*user_info->mapped.account_name) {
 		return NT_STATUS_NOT_IMPLEMENTED;
 	}
 
-	is_local_name = is_myname(user_info->mapped.domain_name);
-	is_my_domain  = strequal(user_info->mapped.domain_name, lp_workgroup(global_loadparm));
+	is_local_name = lp_is_myname(global_loadparm, 
+				  user_info->mapped.domain_name);
+	is_my_domain  = lp_is_mydomain(global_loadparm, 
+				       user_info->mapped.domain_name); 
 
 	/* check whether or not we service this domain/workgroup name */
 	switch (lp_server_role(global_loadparm)) {
diff --git a/source4/auth/auth_server.c b/source4/auth/auth_server.c
index 5d4c33969f..1513228bd9 100644
--- a/source4/auth/auth_server.c
+++ b/source4/auth/auth_server.c
@@ -195,8 +195,8 @@ static NTSTATUS check_smbserver_security(const struct auth_context *auth_context
 	struct smbcli_state *cli;
 	static uint8_t badpass[24];
 	static fstring baduser; 
-	static BOOL tested_password_server = False;
-	static BOOL bad_password_server = False;
+	static bool tested_password_server = false;
+	static bool bad_password_server = false;
 	NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
 	BOOL locally_made_cli = False;
 
@@ -206,7 +206,7 @@ static NTSTATUS check_smbserver_security(const struct auth_context *auth_context
 	 * password file.
 	 */
 
-	if(is_myname(user_info->domain.str)) {
+	if (lp_is_myname(global_loadparm, user_info->domain.str)) {
 		DEBUG(3,("check_smbserver_security: Requested domain was for this machine.\n"));
 		return NT_STATUS_LOGON_FAILURE;
 	}
diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c
index 5770dbf057..2aefb7c52f 100644
--- a/source4/auth/credentials/credentials_files.c
+++ b/source4/auth/credentials/credentials_files.c
@@ -308,7 +308,7 @@ NTSTATUS cli_credentials_set_secrets(struct cli_credentials *cred,
 	} else {
 		keytab = ldb_msg_find_attr_as_string(msgs[0], "privateKeytab", NULL);
 		if (keytab) {
-			keytab = talloc_asprintf(mem_ctx, "FILE:%s", private_path(mem_ctx, keytab));
+			keytab = talloc_asprintf(mem_ctx, "FILE:%s", private_path(mem_ctx, global_loadparm, keytab));
 			if (keytab) {
 				cli_credentials_set_keytab_name(cred, keytab, CRED_SPECIFIED);
 			}
diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c
index 541c1ff181..9bbf31a7c7 100644
--- a/source4/auth/gensec/gensec.c
+++ b/source4/auth/gensec/gensec.c
@@ -1269,7 +1269,7 @@ NTSTATUS gensec_init(void)
 	if (initialized) return NT_STATUS_OK;
 	initialized = True;
 	
-	shared_init = load_samba_modules(NULL, "gensec");
+	shared_init = load_samba_modules(NULL, global_loadparm, "gensec");
 
 	run_init_functions(static_init);
 	run_init_functions(shared_init);
diff --git a/source4/auth/gensec/schannel_state.c b/source4/auth/gensec/schannel_state.c
index afbbd618eb..46fb48ffd3 100644
--- a/source4/auth/gensec/schannel_state.c
+++ b/source4/auth/gensec/schannel_state.c
@@ -41,14 +41,15 @@ struct ldb_context *schannel_db_connect(TALLOC_CTX *mem_ctx)
 		"computerName: CASE_INSENSITIVE\n" \
 		"flatname: CASE_INSENSITIVE\n";
 
-	path = smbd_tmp_path(mem_ctx, "schannel.ldb");
+	path = smbd_tmp_path(mem_ctx, global_loadparm, "schannel.ldb");
 	if (!path) {
 		return NULL;
 	}
 
 	existed = file_exist(path);
 	
-	ldb = ldb_wrap_connect(mem_ctx, path, system_session(mem_ctx), 
+	ldb = ldb_wrap_connect(mem_ctx, global_loadparm, path, 
+			       system_session(mem_ctx), 
 			       NULL, LDB_FLG_NOSYNC, NULL);
 	talloc_free(path);
 	if (!ldb) {
diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c
index d604c33233..68e60dcdc5 100644
--- a/source4/auth/kerberos/krb5_init_context.c
+++ b/source4/auth/kerberos/krb5_init_context.c
@@ -393,7 +393,7 @@ krb5_error_code smb_krb5_init_context(void *parent_ctx,
 
 	talloc_set_destructor(*smb_krb5_context, smb_krb5_context_destroy_1);
 
-	config_file = config_path(tmp_ctx, "krb5.conf");
+	config_file = config_path(tmp_ctx, global_loadparm, "krb5.conf");
 	if (!config_file) {
 		talloc_free(tmp_ctx);
 		return ENOMEM;