svn commit: samba r26222 - in branches/SAMBA_4_0: . source/auth
source/auth/gensec source/auth/ntlmssp source/cldap_server
jelmer at samba.org
jelmer at samba.org
Sun Dec 2 16:20:26 GMT 2007
Author: jelmer
Date: 2007-12-02 16:20:25 +0000 (Sun, 02 Dec 2007)
New Revision: 26222
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26222
Log:
Avoid global_loadparm in a couple more places.
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/cldap_server/netlogon.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-02 16:20:18 UTC (rev 26221)
+++ branches/SAMBA_4_0/source/auth/auth.c 2007-12-02 16:20:25 UTC (rev 26222)
@@ -510,7 +510,7 @@
return &critical_sizes;
}
-NTSTATUS auth_init(void)
+NTSTATUS auth_init(struct loadparm_context *lp_ctx)
{
static bool initialized = false;
@@ -520,7 +520,7 @@
if (initialized) return NT_STATUS_OK;
initialized = true;
- shared_init = load_samba_modules(NULL, global_loadparm, "auth");
+ shared_init = load_samba_modules(NULL, lp_ctx, "auth");
run_init_functions(static_init);
run_init_functions(shared_init);
@@ -532,5 +532,5 @@
NTSTATUS server_service_auth_init(void)
{
- return auth_init();
+ return auth_init(global_loadparm);
}
Modified: branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c 2007-12-02 16:20:18 UTC (rev 26221)
+++ branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c 2007-12-02 16:20:25 UTC (rev 26222)
@@ -779,7 +779,7 @@
{
NTSTATUS ret;
- auth_init();
+ auth_init(global_loadparm);
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-02 16:20:18 UTC (rev 26221)
+++ branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.c 2007-12-02 16:20:25 UTC (rev 26222)
@@ -28,6 +28,7 @@
#include "auth/credentials/credentials.h"
#include "auth/gensec/gensec.h"
#include "auth/auth.h"
+#include "param/param.h"
/**
* Callbacks for NTLMSSP - for both client and server operating modes
@@ -427,7 +428,7 @@
{
NTSTATUS ret;
- auth_init();
+ auth_init(global_loadparm);
ret = gensec_register(&gensec_ntlmssp_security_ops);
if (!NT_STATUS_IS_OK(ret)) {
Modified: branches/SAMBA_4_0/source/cldap_server/netlogon.c
===================================================================
--- branches/SAMBA_4_0/source/cldap_server/netlogon.c 2007-12-02 16:20:18 UTC (rev 26221)
+++ branches/SAMBA_4_0/source/cldap_server/netlogon.c 2007-12-02 16:20:25 UTC (rev 26222)
@@ -45,13 +45,14 @@
const char *user,
const char *src_address,
uint32_t version,
+ struct loadparm_context *lp_ctx,
union nbt_cldap_netlogon *netlogon)
{
const char *ref_attrs[] = {"nETBIOSName", "dnsRoot", "ncName", NULL};
const char *dom_attrs[] = {"objectGUID", NULL};
struct ldb_result *ref_res = NULL, *dom_res = NULL;
int ret;
- const char **services = lp_server_services(global_loadparm);
+ const char **services = lp_server_services(lp_ctx);
uint32_t server_type;
const char *pdc_name;
struct GUID domain_uuid;
@@ -173,17 +174,17 @@
server_type |= NBT_SERVER_KDC;
}
- pdc_name = talloc_asprintf(mem_ctx, "\\\\%s", lp_netbios_name(global_loadparm));
+ pdc_name = talloc_asprintf(mem_ctx, "\\\\%s", lp_netbios_name(lp_ctx));
domain_uuid = samdb_result_guid(dom_res->msgs[0], "objectGUID");
- realm = samdb_result_string(ref_res->msgs[0], "dnsRoot", lp_realm(global_loadparm));
- dns_domain = samdb_result_string(ref_res->msgs[0], "dnsRoot", lp_realm(global_loadparm));
+ realm = samdb_result_string(ref_res->msgs[0], "dnsRoot", lp_realm(lp_ctx));
+ dns_domain = samdb_result_string(ref_res->msgs[0], "dnsRoot", lp_realm(lp_ctx));
pdc_dns_name = talloc_asprintf(mem_ctx, "%s.%s",
strlower_talloc(mem_ctx,
- lp_netbios_name(global_loadparm)),
+ lp_netbios_name(lp_ctx)),
dns_domain);
flatname = samdb_result_string(ref_res->msgs[0], "nETBIOSName",
- lp_workgroup(global_loadparm));
+ lp_workgroup(lp_ctx));
server_site = "Default-First-Site-Name";
client_site = "Default-First-Site-Name";
pdc_ip = iface_best_ip(src_address);
@@ -227,7 +228,7 @@
netlogon->logon5.dns_domain = dns_domain;
netlogon->logon5.pdc_dns_name = pdc_dns_name;
netlogon->logon5.domain = flatname;
- netlogon->logon5.pdc_name = lp_netbios_name(global_loadparm);
+ netlogon->logon5.pdc_name = lp_netbios_name(lp_ctx);
netlogon->logon5.user_name = user;
netlogon->logon5.server_site = server_site;
netlogon->logon5.client_site = client_site;
@@ -242,7 +243,7 @@
netlogon->logon13.dns_domain = dns_domain;
netlogon->logon13.pdc_dns_name = pdc_dns_name;
netlogon->logon13.domain = flatname;
- netlogon->logon13.pdc_name = lp_netbios_name(global_loadparm);
+ netlogon->logon13.pdc_name = lp_netbios_name(lp_ctx);
netlogon->logon13.user_name = user;
netlogon->logon13.server_site = server_site;
netlogon->logon13.client_site = client_site;
@@ -338,7 +339,7 @@
status = cldapd_netlogon_fill(cldapd, tmp_ctx, domain, domain_guid,
user, src->addr,
- version, &netlogon);
+ version, global_loadparm, &netlogon);
if (!NT_STATUS_IS_OK(status)) {
goto failed;
}
More information about the samba-cvs
mailing list