From 94fb6120d80d05de0f24ea71a93c761517fd4231 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 13 Sep 2010 12:15:52 +1000 Subject: s4-secrets: fetch secure channel type with domain SID The secure channel type is needed to work out what DC to connect to Pair-Programmed-With: Andrew Bartlett --- source4/winbind/wb_server.c | 12 +++++++++--- source4/winbind/wb_server.h | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'source4/winbind') diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c index ee44f0a240..96dab0acd5 100644 --- a/source4/winbind/wb_server.c +++ b/source4/winbind/wb_server.c @@ -239,7 +239,9 @@ static void winbind_task_init(struct task_server *task) primary_sid = secrets_get_domain_sid(service, service->task->event_ctx, service->task->lp_ctx, - lpcfg_netbios_name(service->task->lp_ctx), &errstring); + lpcfg_netbios_name(service->task->lp_ctx), + &service->sec_channel_type, + &errstring); if (!primary_sid) { char *message = talloc_asprintf(task, "Cannot start Winbind (standalone configuration): %s: " @@ -253,7 +255,9 @@ static void winbind_task_init(struct task_server *task) primary_sid = secrets_get_domain_sid(service, service->task->event_ctx, service->task->lp_ctx, - lpcfg_workgroup(service->task->lp_ctx), &errstring); + lpcfg_workgroup(service->task->lp_ctx), + &service->sec_channel_type, + &errstring); if (!primary_sid) { char *message = talloc_asprintf(task, "Cannot start Winbind (domain member): %s: " "Have you joined the %s domain?", @@ -266,7 +270,9 @@ static void winbind_task_init(struct task_server *task) primary_sid = secrets_get_domain_sid(service, service->task->event_ctx, service->task->lp_ctx, - lpcfg_workgroup(service->task->lp_ctx), &errstring); + lpcfg_workgroup(service->task->lp_ctx), + &service->sec_channel_type, + &errstring); if (!primary_sid) { char *message = talloc_asprintf(task, "Cannot start Winbind (domain controller): %s: " "Have you provisioned the %s domain?", diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h index 1ffb62e485..7fc778a97b 100644 --- a/source4/winbind/wb_server.h +++ b/source4/winbind/wb_server.h @@ -29,6 +29,7 @@ struct wbsrv_service { struct task_server *task; const struct dom_sid *primary_sid; + enum netr_SchannelType sec_channel_type; struct wbsrv_domain *domains; struct idmap_context *idmap_ctx; const char *priv_pipe_dir; -- cgit