r25570: move code of the locator child into its own file

metze
(This used to be commit 56640908a6367acfdfd53568a0d329c13330e5eb)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 89ab9e31de4635852837359e7108130abac2f43e..ea3708ea18ee099f3e2f7db9d193732b615f33ac 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -866,6 +866,7 @@ WINBINDD_OBJ1 = \
                winbindd/winbindd_cred_cache.o \
                winbindd/winbindd_ccache_access.o \
                winbindd/winbindd_idmap.o \
+               winbindd/winbindd_locator.o \
                auth/token_util.o
 
 WINBINDD_OBJ = \

diff --git a/source3/winbindd/winbindd_locator.c b/source3/winbindd/winbindd_locator.c
new file mode 100644 (file)
index 0000000..3fcb9de
--- /dev/null
+++ b/source3/winbindd/winbindd_locator.c
@@ -0,0 +1,90 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Winbind daemon - miscellaneous other functions
+
+   Copyright (C) Tim Potter      2000
+   Copyright (C) Andrew Bartlett 2002
+
+   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 "winbindd.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_WINBIND
+
+static struct winbindd_child static_locator_child;
+
+void init_locator_child(void)
+{
+       setup_domain_child(NULL, &static_locator_child, "locator");
+}
+
+struct winbindd_child *locator_child(void)
+{
+       return &static_locator_child;
+}
+
+void winbindd_dsgetdcname(struct winbindd_cli_state *state)
+{
+       state->request.domain_name
+               [sizeof(state->request.domain_name)-1] = '\0';
+
+       DEBUG(3, ("[%5lu]: DsGetDcName for %s\n", (unsigned long)state->pid,
+                 state->request.domain_name));
+
+       sendto_child(state, locator_child());
+}
+
+enum winbindd_result winbindd_dual_dsgetdcname(struct winbindd_domain *domain,
+                                              struct winbindd_cli_state *state)
+{
+       NTSTATUS result;
+       struct DS_DOMAIN_CONTROLLER_INFO *info = NULL;
+       const char *dc = NULL;
+
+       state->request.domain_name
+               [sizeof(state->request.domain_name)-1] = '\0';
+
+       DEBUG(3, ("[%5lu]: DsGetDcName for %s\n", (unsigned long)state->pid,
+                 state->request.domain_name));
+
+       result = DsGetDcName(state->mem_ctx, NULL, state->request.domain_name,
+                            NULL, NULL, state->request.flags, &info);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               return WINBINDD_ERROR;
+       }
+
+       if (info->domain_controller_address) {
+               dc = info->domain_controller_address;
+               if ((dc[0] == '\\') && (dc[1] == '\\')) {
+                       dc += 2;
+               }
+       }
+
+       if ((!dc || !is_ipaddress_v4(dc)) && info->domain_controller_name) {
+               dc = info->domain_controller_name;
+       }
+
+       if (!dc || !*dc) {
+               return WINBINDD_ERROR;
+       }
+
+       fstrcpy(state->response.data.dc_name, dc);
+
+       return WINBINDD_OK;
+}

diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index dc2e35884e316eaf727848a8532dd4b7a592b5e5..9d77879e76697acb1a0e2ace4c960ff74213cad8 100644 (file)
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -289,70 +289,6 @@ enum winbindd_result winbindd_dual_getdcname(struct winbindd_domain *domain,
        return WINBINDD_OK;
 }
 
-static struct winbindd_child static_locator_child;
-
-void init_locator_child(void)
-{
-       setup_domain_child(NULL, &static_locator_child, "locator");
-}
-
-struct winbindd_child *locator_child(void)
-{
-       return &static_locator_child;
-}
-
-void winbindd_dsgetdcname(struct winbindd_cli_state *state)
-{
-       state->request.domain_name
-               [sizeof(state->request.domain_name)-1] = '\0';
-
-       DEBUG(3, ("[%5lu]: DsGetDcName for %s\n", (unsigned long)state->pid,
-                 state->request.domain_name));
-
-       sendto_child(state, locator_child());
-}
-
-enum winbindd_result winbindd_dual_dsgetdcname(struct winbindd_domain *domain,
-                                              struct winbindd_cli_state *state)
-{
-       NTSTATUS result;
-       struct DS_DOMAIN_CONTROLLER_INFO *info = NULL;
-       const char *dc = NULL;
-
-       state->request.domain_name
-               [sizeof(state->request.domain_name)-1] = '\0';
-
-       DEBUG(3, ("[%5lu]: DsGetDcName for %s\n", (unsigned long)state->pid,
-                 state->request.domain_name));
-
-       result = DsGetDcName(state->mem_ctx, NULL, state->request.domain_name,
-                            NULL, NULL, state->request.flags, &info);
-
-       if (!NT_STATUS_IS_OK(result)) {
-               return WINBINDD_ERROR;
-       }
-
-       if (info->domain_controller_address) {
-               dc = info->domain_controller_address;
-               if ((dc[0] == '\\') && (dc[1] == '\\')) {
-                       dc += 2;
-               }
-       }
-
-       if ((!dc || !is_ipaddress_v4(dc)) && info->domain_controller_name) {
-               dc = info->domain_controller_name;
-       }
-
-       if (!dc || !*dc) {
-               return WINBINDD_ERROR;
-       }
-
-       fstrcpy(state->response.data.dc_name, dc);
-
-       return WINBINDD_OK;
-}
-
-
 struct sequence_state {
        TALLOC_CTX *mem_ctx;
        struct winbindd_cli_state *cli_state;