svn commit: samba r26221 - in branches/SAMBA_4_0: . source/auth
source/auth/ntlmssp source/rpc_server/netlogon
source/scripting/ejs source/smb_server/smb
jelmer at samba.org
jelmer at samba.org
Sun Dec 2 16:20:19 GMT 2007
Author: jelmer
Date: 2007-12-02 16:20:18 +0000 (Sun, 02 Dec 2007)
New Revision: 26221
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26221
Log:
Add loadparm_context parameter to auth_context_create.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/auth/auth.c
branches/SAMBA_4_0/source/auth/auth.h
branches/SAMBA_4_0/source/auth/auth_simple.c
branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_server.c
branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c
branches/SAMBA_4_0/source/smb_server/smb/negprot.c
branches/SAMBA_4_0/source/smb_server/smb/sesssetup.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-01 11:43:38 UTC (rev 26220)
+++ branches/SAMBA_4_0/source/auth/auth.c 2007-12-02 16:20:18 UTC (rev 26221)
@@ -414,18 +414,19 @@
NTSTATUS auth_context_create(TALLOC_CTX *mem_ctx,
struct event_context *ev,
struct messaging_context *msg,
+ struct loadparm_context *lp_ctx,
struct auth_context **auth_ctx)
{
const char **auth_methods = NULL;
- switch (lp_server_role(global_loadparm)) {
+ switch (lp_server_role(lp_ctx)) {
case ROLE_STANDALONE:
- auth_methods = lp_parm_string_list(global_loadparm, NULL, "auth methods", "standalone", NULL);
+ auth_methods = lp_parm_string_list(lp_ctx, NULL, "auth methods", "standalone", NULL);
break;
case ROLE_DOMAIN_MEMBER:
- auth_methods = lp_parm_string_list(global_loadparm, NULL, "auth methods", "member server", NULL);
+ auth_methods = lp_parm_string_list(lp_ctx, NULL, "auth methods", "member server", NULL);
break;
case ROLE_DOMAIN_CONTROLLER:
- auth_methods = lp_parm_string_list(global_loadparm, NULL, "auth methods", "domain controller", NULL);
+ auth_methods = lp_parm_string_list(lp_ctx, NULL, "auth methods", "domain controller", NULL);
break;
}
return auth_context_create_methods(mem_ctx, auth_methods, ev, msg, auth_ctx);
Modified: branches/SAMBA_4_0/source/auth/auth.h
===================================================================
--- branches/SAMBA_4_0/source/auth/auth.h 2007-12-01 11:43:38 UTC (rev 26220)
+++ branches/SAMBA_4_0/source/auth/auth.h 2007-12-02 16:20:18 UTC (rev 26221)
@@ -26,6 +26,7 @@
union netr_Validation;
struct netr_SamBaseInfo;
struct netr_SamInfo3;
+struct loadparm_context;
/* modules can use the following to determine if the interface has changed
* please increment the version number after each interface change
Modified: branches/SAMBA_4_0/source/auth/auth_simple.c
===================================================================
--- branches/SAMBA_4_0/source/auth/auth_simple.c 2007-12-01 11:43:38 UTC (rev 26220)
+++ branches/SAMBA_4_0/source/auth/auth_simple.c 2007-12-02 16:20:18 UTC (rev 26221)
@@ -24,6 +24,7 @@
#include "includes.h"
#include "auth/auth.h"
#include "lib/events/events.h"
+#include "param/param.h"
/*
It's allowed to pass NULL as session_info,
@@ -49,6 +50,7 @@
nt_status = auth_context_create(tmp_ctx,
ev, msg,
+ global_loadparm,
&auth_context);
if (!NT_STATUS_IS_OK(nt_status)) {
talloc_free(tmp_ctx);
Modified: branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_server.c
===================================================================
--- branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_server.c 2007-12-01 11:43:38 UTC (rev 26220)
+++ branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_server.c 2007-12-02 16:20:18 UTC (rev 26221)
@@ -792,6 +792,7 @@
nt_status = auth_context_create(gensec_ntlmssp_state,
gensec_security->event_ctx,
gensec_security->msg_ctx,
+ global_loadparm,
&gensec_ntlmssp_state->auth_context);
NT_STATUS_NOT_OK_RETURN(nt_status);
Modified: branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c 2007-12-01 11:43:38 UTC (rev 26220)
+++ branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c 2007-12-02 16:20:18 UTC (rev 26221)
@@ -432,6 +432,7 @@
/* TODO: we need to deny anonymous access here */
nt_status = auth_context_create(mem_ctx,
dce_call->event_ctx, dce_call->msg_ctx,
+ global_loadparm,
&auth_context);
NT_STATUS_NOT_OK_RETURN(nt_status);
@@ -458,6 +459,7 @@
/* TODO: we need to deny anonymous access here */
nt_status = auth_context_create(mem_ctx,
dce_call->event_ctx, dce_call->msg_ctx,
+ global_loadparm,
&auth_context);
NT_STATUS_NOT_OK_RETURN(nt_status);
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c 2007-12-01 11:43:38 UTC (rev 26220)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c 2007-12-02 16:20:18 UTC (rev 26221)
@@ -62,7 +62,7 @@
if (auth_types) {
nt_status = auth_context_create_methods(tmp_ctx, auth_types, ev, msg, &auth_context);
} else {
- nt_status = auth_context_create(tmp_ctx, ev, msg, &auth_context);
+ nt_status = auth_context_create(tmp_ctx, ev, msg, global_loadparm, &auth_context);
}
if (!NT_STATUS_IS_OK(nt_status)) {
mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
Modified: branches/SAMBA_4_0/source/smb_server/smb/negprot.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/negprot.c 2007-12-01 11:43:38 UTC (rev 26220)
+++ branches/SAMBA_4_0/source/smb_server/smb/negprot.c 2007-12-02 16:20:18 UTC (rev 26221)
@@ -47,6 +47,7 @@
nt_status = auth_context_create(smb_conn,
smb_conn->connection->event.ctx,
smb_conn->connection->msg_ctx,
+ global_loadparm,
&smb_conn->negotiate.auth_context);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0, ("auth_context_create() returned %s", nt_errstr(nt_status)));
Modified: branches/SAMBA_4_0/source/smb_server/smb/sesssetup.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/sesssetup.c 2007-12-01 11:43:38 UTC (rev 26220)
+++ branches/SAMBA_4_0/source/smb_server/smb/sesssetup.c 2007-12-02 16:20:18 UTC (rev 26221)
@@ -246,6 +246,7 @@
status = auth_context_create(req,
req->smb_conn->connection->event.ctx,
req->smb_conn->connection->msg_ctx,
+ global_loadparm,
&auth_context);
if (!NT_STATUS_IS_OK(status)) goto failed;
} else {
More information about the samba-cvs
mailing list