s4:param Modify secrets_get_domain_sid to give more useful errors

This also moves the calls to secrets_get_domain_sid back into
winbind_task_init(), so that we can terminate with a much more
detailed error message.  (The previous message was simply
NT_STATUS_CANT_ACCESS_DOMAIN_INFO).

Andrew Bartlett

1 files changed, 0 insertions, 53 deletions

diff --git a/source4/winbind/wb_setup_domains.c b/source4/winbind/wb_setup_domains.c
deleted file mode 100644
index 5ce6500d4d..0000000000
--- a/source4/winbind/wb_setup_domains.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-   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 "param/secrets.h"
-#include "param/param.h"
-
-NTSTATUS wbsrv_setup_domains(struct wbsrv_service *service)
-{
-	const struct dom_sid *primary_sid;
-
-	/*
-	 * This is a bit more difficult here: when we are a domain controller
-	 * or a joined domain member the first call will work. But if we are
-	 * a standalone server or unjoined member then the second is the right
-	 * one.
-	 */
-	primary_sid = secrets_get_domain_sid(service,
-					     service->task->event_ctx,
-					     service->task->lp_ctx,
-					     lp_workgroup(service->task->lp_ctx));
-	if (primary_sid == NULL) {
-		primary_sid = secrets_get_domain_sid(service,
-						     service->task->event_ctx,
-						     service->task->lp_ctx,
-						     lp_netbios_name(service->task->lp_ctx));
-	}
-	if (primary_sid == NULL) {
-		return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
-	}
-
-	service->primary_sid = primary_sid;
-
-	return NT_STATUS_OK;
-}