From 2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij 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/auth/auth_sam.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source4/auth/auth_sam.c') 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)) { -- cgit