From ba0facd688d2b0d864364031a373abea73e9154f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 5 Dec 2008 16:53:44 +0100
Subject: [PATCH] s4:winbind: move setting up the primary_sid into a new
 function wbsrv_setup_domains()

metze
---
 source4/winbind/config.mk          |  1 +
 source4/winbind/wb_server.c        | 10 +++----
 source4/winbind/wb_setup_domains.c | 42 ++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 source4/winbind/wb_setup_domains.c

diff --git a/source4/winbind/config.mk b/source4/winbind/config.mk
index f719f00853d..865ff90567a 100644
--- a/source4/winbind/config.mk
+++ b/source4/winbind/config.mk
@@ -20,6 +20,7 @@ PRIVATE_DEPENDENCIES = \
 
 WINBIND_OBJ_FILES = $(addprefix $(winbindsrcdir)/, \
 		wb_server.o \
+		wb_setup_domains.o \
 		wb_irpc.o \
 		wb_samba3_protocol.o \
 		wb_samba3_cmd.o \
diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index b8309597d7b..9ffcd467eeb 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;
 	}
 
diff --git a/source4/winbind/wb_setup_domains.c b/source4/winbind/wb_setup_domains.c
new file mode 100644
index 00000000000..92b91c182fd
--- /dev/null
+++ b/source4/winbind/wb_setup_domains.c
@@ -0,0 +1,42 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Copyright (C) Stefan Metzmacher 2008
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "winbind/wb_server.h"
+#include "smbd/service_task.h"
+#include "auth/credentials/credentials.h"
+#include "param/secrets.h"
+#include "param/param.h"
+
+NTSTATUS wbsrv_setup_domains(struct wbsrv_service *service)
+{
+	const struct dom_sid *primary_sid;
+
+	primary_sid = secrets_get_domain_sid(service,
+					     service->task->event_ctx,
+					     service->task->lp_ctx,
+					     lp_workgroup(service->task->lp_ctx));
+	if (!primary_sid) {
+		return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+	}
+
+	service->primary_sid = primary_sid;
+
+	return NT_STATUS_OK;
+}
-- 
2.34.1