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

[jelmer/samba4-debian.git] / source / auth / auth.c

diff --git a/source/auth/auth.c b/source/auth/auth.c
index 04aa5f5c91dcaab50a426367dd4da052a564367c..20524b34a4fe1e1b3e7268e5e465644e40bb0061 100644 (file)
--- a/source/auth/auth.c
+++ b/source/auth/auth.c
@@ -419,13 +419,13 @@ NTSTATUS auth_context_create(TALLOC_CTX *mem_ctx,
        const char **auth_methods = NULL;
        switch (lp_server_role(global_loadparm)) {
        case ROLE_STANDALONE:
-               auth_methods = lp_parm_string_list(NULL, "auth methods", "standalone", NULL);
+               auth_methods = lp_parm_string_list(global_loadparm, NULL, "auth methods", "standalone", NULL);
                break;
        case ROLE_DOMAIN_MEMBER:
-               auth_methods = lp_parm_string_list(NULL, "auth methods", "member server", NULL);
+               auth_methods = lp_parm_string_list(global_loadparm, NULL, "auth methods", "member server", NULL);
                break;
        case ROLE_DOMAIN_CONTROLLER:
-               auth_methods = lp_parm_string_list(NULL, "auth methods", "domain controller", NULL);
+               auth_methods = lp_parm_string_list(global_loadparm, NULL, "auth methods", "domain controller", NULL);
                break;
        }
        return auth_context_create_methods(mem_ctx, auth_methods, ev, msg, auth_ctx);
@@ -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);