diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-28 01:17:46 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:25 -0500 |
commit | 37d53832a4623653f706e77985a79d84bd7c6694 (patch) | |
tree | 265e308027d6641bbdb29a4feddbe86ef8b25fd1 /source4/winbind/wb_init_domain.c | |
parent | e09226cb35d627affddc08c4a88527184b8ffcf9 (diff) | |
download | samba-37d53832a4623653f706e77985a79d84bd7c6694.tar.gz samba-37d53832a4623653f706e77985a79d84bd7c6694.tar.bz2 samba-37d53832a4623653f706e77985a79d84bd7c6694.zip |
r25398: Parse loadparm context to all lp_*() functions.
(This used to be commit 3fcc960839c6e5ca4de2c3c042f12f369ac5f238)
Diffstat (limited to 'source4/winbind/wb_init_domain.c')
-rw-r--r-- | source4/winbind/wb_init_domain.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c index 21fbb6a2b7..7d050d5c67 100644 --- a/source4/winbind/wb_init_domain.c +++ b/source4/winbind/wb_init_domain.c @@ -151,7 +151,7 @@ struct composite_context *wb_init_domain_send(TALLOC_CTX *mem_ctx, cli_credentials_set_event_context(state->domain->libnet_ctx->cred, service->task->event_ctx); - cli_credentials_set_conf(state->domain->libnet_ctx->cred); + cli_credentials_set_conf(state->domain->libnet_ctx->cred, global_loadparm); /* Connect the machine account to the credentials */ state->ctx->status = @@ -163,14 +163,14 @@ struct composite_context *wb_init_domain_send(TALLOC_CTX *mem_ctx, state->domain->netlogon_pipe = NULL; if ((!cli_credentials_is_anonymous(state->domain->libnet_ctx->cred)) && - ((lp_server_role() == ROLE_DOMAIN_MEMBER) || - (lp_server_role() == ROLE_DOMAIN_CONTROLLER)) && + ((lp_server_role(global_loadparm) == ROLE_DOMAIN_MEMBER) || + (lp_server_role(global_loadparm) == ROLE_DOMAIN_CONTROLLER)) && (dom_sid_equal(state->domain->info->sid, state->service->primary_sid))) { state->domain->netlogon_binding->flags |= DCERPC_SCHANNEL; /* For debugging, it can be a real pain if all the traffic is encrypted */ - if (lp_winbind_sealed_pipes()) { + if (lp_winbind_sealed_pipes(global_loadparm)) { state->domain->netlogon_binding->flags |= (DCERPC_SIGN | DCERPC_SEAL ); } else { state->domain->netlogon_binding->flags |= (DCERPC_SIGN); @@ -216,7 +216,7 @@ static void init_domain_recv_netlogonpipe(struct composite_context *ctx) state->domain->lsa_binding = init_domain_binding(state, &ndr_table_lsarpc); /* For debugging, it can be a real pain if all the traffic is encrypted */ - if (lp_winbind_sealed_pipes()) { + if (lp_winbind_sealed_pipes(global_loadparm)) { state->domain->lsa_binding->flags |= (DCERPC_SIGN | DCERPC_SEAL ); } else { state->domain->lsa_binding->flags |= (DCERPC_SIGN); |