diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-27 23:24:39 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-27 17:11:16 +0200 |
| commit | 666dba33531c7e7d391318c915fb393ec5b1da36 (patch) | |
| tree | cf5b864e6607487b4487ee5df7de2484e8d59b3b /source3/rpc_server | |
| parent | 7e8ed7d68dc48dd283df649c3f75d5679f7beae9 (diff) | |
| download | samba-666dba33531c7e7d391318c915fb393ec5b1da36.tar.gz samba-666dba33531c7e7d391318c915fb393ec5b1da36.tar.bz2 samba-666dba33531c7e7d391318c915fb393ec5b1da36.zip | |
s3-param: Rename loadparm_s3_context -> loadparm_s3_helpers
This helps clarify the role of this structure and wrapper function.
The purpose here is to provide helper functions to the lib/param
loadparm_context that point back at the s3 lp_ functions. This allows
a struct loadparm_context to be passed to any point in the code, and
always refer to the correct loadparm system. If this has not been
set, the variables loaded in the lib/param code will be returned.
As requested by Michael Adam.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Jun 27 17:11:16 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/netlogon/srv_netlog_nt.c | 10 | ||||
| -rw-r--r-- | source3/rpc_server/srv_pipe.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c index f640a2e81f..1ab1034ae6 100644 --- a/source3/rpc_server/netlogon/srv_netlog_nt.c +++ b/source3/rpc_server/netlogon/srv_netlog_nt.c @@ -1001,7 +1001,7 @@ NTSTATUS _netr_ServerAuthenticate3(struct pipes_struct *p, goto out; } - lp_ctx = loadparm_init_s3(p->mem_ctx, loadparm_s3_context()); + lp_ctx = loadparm_init_s3(p->mem_ctx, loadparm_s3_helpers()); if (lp_ctx == NULL) { DEBUG(10, ("loadparm_init_s3 failed\n")); status = NT_STATUS_INTERNAL_ERROR; @@ -1106,7 +1106,7 @@ static NTSTATUS netr_creds_server_step_check(struct pipes_struct *p, } } - lp_ctx = loadparm_init_s3(mem_ctx, loadparm_s3_context()); + lp_ctx = loadparm_init_s3(mem_ctx, loadparm_s3_helpers()); if (lp_ctx == NULL) { DEBUG(0, ("loadparm_init_s3 failed\n")); return NT_STATUS_INTERNAL_ERROR; @@ -1782,7 +1782,7 @@ NTSTATUS _netr_LogonSamLogonEx(struct pipes_struct *p, return NT_STATUS_INVALID_PARAMETER; } - lp_ctx = loadparm_init_s3(p->mem_ctx, loadparm_s3_context()); + lp_ctx = loadparm_init_s3(p->mem_ctx, loadparm_s3_helpers()); if (lp_ctx == NULL) { DEBUG(0, ("loadparm_init_s3 failed\n")); return NT_STATUS_INTERNAL_ERROR; @@ -2335,7 +2335,7 @@ NTSTATUS _netr_GetForestTrustInformation(struct pipes_struct *p, /* TODO: check server name */ - lp_ctx = loadparm_init_s3(p->mem_ctx, loadparm_s3_context()); + lp_ctx = loadparm_init_s3(p->mem_ctx, loadparm_s3_helpers()); if (lp_ctx == NULL) { DEBUG(0, ("loadparm_init_s3 failed\n")); return NT_STATUS_INTERNAL_ERROR; @@ -2441,7 +2441,7 @@ NTSTATUS _netr_ServerGetTrustInfo(struct pipes_struct *p, DATA_BLOB session_key; struct loadparm_context *lp_ctx; - lp_ctx = loadparm_init_s3(p->mem_ctx, loadparm_s3_context()); + lp_ctx = loadparm_init_s3(p->mem_ctx, loadparm_s3_helpers()); if (lp_ctx == NULL) { DEBUG(0, ("loadparm_init_s3 failed\n")); return NT_STATUS_INTERNAL_ERROR; diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index a870ec14fe..18356382ed 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -447,7 +447,7 @@ static bool pipe_schannel_auth_bind(struct pipes_struct *p, return false; } - lp_ctx = loadparm_init_s3(p, loadparm_s3_context()); + lp_ctx = loadparm_init_s3(p, loadparm_s3_helpers()); if (!lp_ctx) { DEBUG(0,("pipe_schannel_auth_bind: loadparm_init_s3() failed!\n")); return false; |