summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-12-05 16:53:44 +0100
committerStefan Metzmacher <metze@samba.org>2008-12-06 12:40:30 +0100
commitba0facd688d2b0d864364031a373abea73e9154f (patch)
tree3e7f7787f54dfa6bc5353e1b0462d5e4077f071d
parentf9172a2af558262a6993059114813daf24c9e173 (diff)
downloadsamba-ba0facd688d2b0d864364031a373abea73e9154f.tar.gz
samba-ba0facd688d2b0d864364031a373abea73e9154f.tar.bz2
samba-ba0facd688d2b0d864364031a373abea73e9154f.zip
s4:winbind: move setting up the primary_sid into a new function wbsrv_setup_domains()
metze
-rw-r--r--source4/winbind/config.mk1
-rw-r--r--source4/winbind/wb_server.c10
-rw-r--r--source4/winbind/wb_setup_domains.c42
3 files changed, 46 insertions, 7 deletions
diff --git a/source4/winbind/config.mk b/source4/winbind/config.mk
index f719f00853..865ff90567 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 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;
}
diff --git a/source4/winbind/wb_setup_domains.c b/source4/winbind/wb_setup_domains.c
new file mode 100644
index 0000000000..92b91c182f
--- /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;
+}