Merge branch 'master' of ssh://git.samba.org/data/git/abartlet/samba into extended...

[abartlet/samba.git/.git] / source4 / winbind / wb_server.c

diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index b8309597d7b89c38f474aa0a90a7fd8e6679bf24..9ffcd467eebc5ef17719e252d0f8dbf0f6eab16c 100644 (file)
--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@@ -147,13 +147,9 @@ static void winbind_task_init(struct task_server *task)
        if (!service) goto nomem;
        service->task   = task;
 
        if (!service) goto nomem;
        service->task   = task;
 

-       service->primary_sid = secrets_get_domain_sid(service,
-                                                     task->event_ctx,
-                                                     task->lp_ctx,
-                                                     lp_workgroup(task->lp_ctx));
-       if (service->primary_sid == NULL) {
-               task_server_terminate(
-                       task, nt_errstr(NT_STATUS_CANT_ACCESS_DOMAIN_INFO));
+       status = wbsrv_setup_domains(service);
+       if (!NT_STATUS_IS_OK(status)) {
+               task_server_terminate(task, nt_errstr(status));

                return;
        }
 
                return;
        }