s3: Remove unused winbindd_dual_getdcname
authorVolker Lendecke <vl@samba.org>
Mon, 21 Dec 2009 13:57:03 +0000 (14:57 +0100)
committerVolker Lendecke <vl@samba.org>
Mon, 21 Dec 2009 15:27:19 +0000 (16:27 +0100)
source3/winbindd/winbindd_domain.c
source3/winbindd/winbindd_misc.c
source3/winbindd/winbindd_proto.h

index 304761f4842890de0343da77ae899f3fc8580222..cbb1a8ab9aab0f1287ee81204eaf54b54813524f 100644 (file)
@@ -38,10 +38,6 @@ static const struct winbindd_child_dispatch_table domain_dispatch_table[] = {
                .name           = "INIT_CONNECTION",
                .struct_cmd     = WINBINDD_INIT_CONNECTION,
                .struct_fn      = winbindd_dual_init_connection,
-       },{
-               .name           = "GETDCNAME",
-               .struct_cmd     = WINBINDD_GETDCNAME,
-               .struct_fn      = winbindd_dual_getdcname,
        },{
                .name           = "SHOW_SEQUENCE",
                .struct_cmd     = WINBINDD_SHOW_SEQUENCE,
index 3ebd9ffdbd25f37bb1676ee40a9a1b4971dffe15..95d47ef2e9a0e50661adb81d5c3f15ff0af6f900 100644 (file)
@@ -225,78 +225,6 @@ enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain *
        return WINBINDD_OK;
 }
 
-enum winbindd_result winbindd_dual_getdcname(struct winbindd_domain *domain,
-                                            struct winbindd_cli_state *state)
-{
-       const char *dcname_slash = NULL;
-       const char *p;
-       struct rpc_pipe_client *netlogon_pipe;
-       NTSTATUS result;
-       WERROR werr;
-       unsigned int orig_timeout;
-       struct winbindd_domain *req_domain;
-
-       state->request->domain_name
-               [sizeof(state->request->domain_name)-1] = '\0';
-
-       DEBUG(3, ("[%5lu]: Get DC name for %s\n", (unsigned long)state->pid,
-                 state->request->domain_name));
-
-       result = cm_connect_netlogon(domain, &netlogon_pipe);
-
-       if (!NT_STATUS_IS_OK(result)) {
-               DEBUG(1, ("Can't contact the NETLOGON pipe\n"));
-               return WINBINDD_ERROR;
-       }
-
-       /* This call can take a long time - allow the server to time out.
-          35 seconds should do it. */
-
-       orig_timeout = rpccli_set_timeout(netlogon_pipe, 35000);
-
-       req_domain = find_domain_from_name_noinit(state->request->domain_name);
-       if (req_domain == domain) {
-               result = rpccli_netr_GetDcName(netlogon_pipe,
-                                              state->mem_ctx,
-                                              domain->dcname,
-                                              state->request->domain_name,
-                                              &dcname_slash,
-                                              &werr);
-       } else {
-               result = rpccli_netr_GetAnyDCName(netlogon_pipe,
-                                                 state->mem_ctx,
-                                                 domain->dcname,
-                                                 state->request->domain_name,
-                                                 &dcname_slash,
-                                                 &werr);
-       }
-       /* And restore our original timeout. */
-       rpccli_set_timeout(netlogon_pipe, orig_timeout);
-
-       if (!NT_STATUS_IS_OK(result)) {
-               DEBUG(5,("Error requesting DCname for domain %s: %s\n",
-                       state->request->domain_name, nt_errstr(result)));
-               return WINBINDD_ERROR;
-       }
-
-       if (!W_ERROR_IS_OK(werr)) {
-               DEBUG(5, ("Error requesting DCname for domain %s: %s\n",
-                       state->request->domain_name, win_errstr(werr)));
-               return WINBINDD_ERROR;
-       }
-
-       p = dcname_slash;
-       if (*p == '\\') {
-               p+=1;
-       }
-       if (*p == '\\') {
-               p+=1;
-       }
-
-       fstrcpy(state->response->data.dc_name, p);
-       return WINBINDD_OK;
-}
-
 /* This is the child-only version of --sequence. It only allows for a single
  * domain (ie "our" one) to be displayed. */
 
index 5f99d8ebbab66df27a90c13fae5828eb0c01b533..afcbcdbeca27151032df6fe054acd7375d0a0a67 100644 (file)
@@ -403,8 +403,6 @@ void winbindd_list_ent(struct winbindd_cli_state *state, enum ent_type type);
 void winbindd_list_trusted_domains(struct winbindd_cli_state *state);
 enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain *domain,
                                                        struct winbindd_cli_state *state);
-enum winbindd_result winbindd_dual_getdcname(struct winbindd_domain *domain,
-                                            struct winbindd_cli_state *state);
 void winbindd_show_sequence(struct winbindd_cli_state *state);
 enum winbindd_result winbindd_dual_show_sequence(struct winbindd_domain *domain,
                                                 struct winbindd_cli_state *state);