r26379: Remove more global_loadparm instances.

(This used to be commit b6f66eb5e00ed01029fa81f408d6154ab01e74e7)

diff --git a/source4/auth/auth.c b/source4/auth/auth.c
index 0068c3bde7b1e581f9504f28a32ff95c24021445..918890b3f621d3e372f3fdb8e85ebeea8f1a649f 100644 (file)
--- a/source4/auth/auth.c
+++ b/source4/auth/auth.c
@@ -512,27 +512,21 @@ const struct auth_critical_sizes *auth_interface_version(void)
        return &critical_sizes;
 }
 
-NTSTATUS auth_init(struct loadparm_context *lp_ctx)
+NTSTATUS auth_init(void)
 {
        static bool initialized = false;
 
        init_module_fn static_init[] = STATIC_auth_MODULES;
-       init_module_fn *shared_init;
        
        if (initialized) return NT_STATUS_OK;
        initialized = true;
        
-       shared_init = load_samba_modules(NULL, lp_ctx, "auth");
-
        run_init_functions(static_init);
-       run_init_functions(shared_init);
-
-       talloc_free(shared_init);
        
        return NT_STATUS_OK;    
 }
 
 NTSTATUS server_service_auth_init(void)
 {
-       return auth_init(global_loadparm);
+       return auth_init();
 }

diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c
index 282be5a00142a6f02e0d933898df37fc88da42f4..ca289f24d361cd4023151c861c7b0ba61432150e 100644 (file)
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -779,7 +779,7 @@ NTSTATUS gensec_krb5_init(void)
 {
        NTSTATUS ret;
 
-       auth_init(global_loadparm);
+       auth_init();
 
        ret = gensec_register(&gensec_krb5_security_ops);
        if (!NT_STATUS_IS_OK(ret)) {

diff --git a/source4/auth/ntlmssp/ntlmssp.c b/source4/auth/ntlmssp/ntlmssp.c
index e30d1986ee6bef8526c37a87d1281c8759a6594f..efb1e630474415c69ad3a1e7bc6b1db164771407 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp.c
+++ b/source4/auth/ntlmssp/ntlmssp.c
@@ -428,7 +428,7 @@ NTSTATUS gensec_ntlmssp_init(void)
 {
        NTSTATUS ret;
 
-       auth_init(global_loadparm);
+       auth_init();
 
        ret = gensec_register(&gensec_ntlmssp_security_ops);
        if (!NT_STATUS_IS_OK(ret)) {

diff --git a/source4/cluster/ctdb/opendb_ctdb.c b/source4/cluster/ctdb/opendb_ctdb.c
index c8b673e74d22d755c45c8a643100c76372d7f4b9..bb8ae26d3d49112c935823a01f7bbb5614b94d70 100644 (file)
--- a/source4/cluster/ctdb/opendb_ctdb.c
+++ b/source4/cluster/ctdb/opendb_ctdb.c
@@ -97,7 +97,7 @@ static struct odb_context *odb_ctdb_init(TALLOC_CTX *mem_ctx,
        odb->ntvfs_ctx = ntvfs_ctx;
 
        /* leave oplocks disabled by default until the code is working */
-       odb->oplocks = lp_parm_bool(global_loadparm, NULL, "opendb", "oplocks", false);
+       odb->oplocks = lp_parm_bool(ntvfs_ctx->lp_ctx, NULL, "opendb", "oplocks", false);
 
        return odb;
 }