Author: jelmer Date: 2007-12-10 18:41:38 +0000 (Mon, 10 Dec 2007) New Revision: 26379
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26379 Log: Remove more global_loadparm instances. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/auth/auth.c branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.c branches/SAMBA_4_0/source/cluster/ctdb/opendb_ctdb.c Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/auth/auth.c =================================================================== --- branches/SAMBA_4_0/source/auth/auth.c 2007-12-10 18:41:33 UTC (rev 26378) +++ branches/SAMBA_4_0/source/auth/auth.c 2007-12-10 18:41:38 UTC (rev 26379) @@ -512,27 +512,21 @@ 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(); } Modified: branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c =================================================================== --- branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c 2007-12-10 18:41:33 UTC (rev 26378) +++ branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c 2007-12-10 18:41:38 UTC (rev 26379) @@ -779,7 +779,7 @@ { NTSTATUS ret; - auth_init(global_loadparm); + auth_init(); ret = gensec_register(&gensec_krb5_security_ops); if (!NT_STATUS_IS_OK(ret)) { Modified: branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.c =================================================================== --- branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.c 2007-12-10 18:41:33 UTC (rev 26378) +++ branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.c 2007-12-10 18:41:38 UTC (rev 26379) @@ -428,7 +428,7 @@ { NTSTATUS ret; - auth_init(global_loadparm); + auth_init(); ret = gensec_register(&gensec_ntlmssp_security_ops); if (!NT_STATUS_IS_OK(ret)) { Modified: branches/SAMBA_4_0/source/cluster/ctdb/opendb_ctdb.c =================================================================== --- branches/SAMBA_4_0/source/cluster/ctdb/opendb_ctdb.c 2007-12-10 18:41:33 UTC (rev 26378) +++ branches/SAMBA_4_0/source/cluster/ctdb/opendb_ctdb.c 2007-12-10 18:41:38 UTC (rev 26379) @@ -97,7 +97,7 @@ 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; }
