summaryrefslogtreecommitdiff
path: root/source4/winbind/wb_server.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-12-16 11:41:20 +1100
committerAndrew Tridgell <tridge@samba.org>2008-12-16 11:41:20 +1100
commitf448fde4e35e56508ad93be8de9f60d88e8b8dcd (patch)
tree597b58ba1af03f5250af918ec15300c385281706 /source4/winbind/wb_server.c
parenta226d86dcec393b2cd657d5441c3041dfdf5cd8f (diff)
parent530758dc2a6dd6dce083789b328e16e51ba6573d (diff)
downloadsamba-f448fde4e35e56508ad93be8de9f60d88e8b8dcd.tar.gz
samba-f448fde4e35e56508ad93be8de9f60d88e8b8dcd.tar.bz2
samba-f448fde4e35e56508ad93be8de9f60d88e8b8dcd.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/winbind/wb_server.c')
-rw-r--r--source4/winbind/wb_server.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index b8309597d7..9ffcd467ee 100644
--- 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;
- 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;
}