winbindd: Make wcache_lookup_useraliases static

[vlendec/samba-autobuild/.git] / source3 / winbindd / winbindd_locator.c

diff --git a/source3/winbindd/winbindd_locator.c b/source3/winbindd/winbindd_locator.c
index b35d8dcf545d55e4212449d321872333074ae3a9..59e8614fdbcc9a30807a4389d2bfb07cc131af89 100644 (file)
--- a/source3/winbindd/winbindd_locator.c
+++ b/source3/winbindd/winbindd_locator.c
@@ -27,143 +27,18 @@
 #define DBGC_CLASS DBGC_WINBIND
 
 
-static const struct winbindd_child_dispatch_table locator_dispatch_table[];
-
 static struct winbindd_child static_locator_child;
 
-void init_locator_child(void)
-{
-       setup_child(&static_locator_child,
-                   locator_dispatch_table,
-                   "log.winbindd", "locator");
-}
-
 struct winbindd_child *locator_child(void)
 {
        return &static_locator_child;
 }
 
-void winbindd_dsgetdcname(struct winbindd_cli_state *state)
-{
-       state->request->data.dsgetdcname.domain_name
-               [sizeof(state->request->data.dsgetdcname.domain_name)-1] = '\0';
-       state->request->data.dsgetdcname.site_name
-               [sizeof(state->request->data.dsgetdcname.site_name)-1] = '\0';
-       state->request->data.dsgetdcname.domain_guid
-               [sizeof(state->request->data.dsgetdcname.domain_guid)-1] = '\0';
-
-       DEBUG(3, ("[%5lu]: dsgetdcname for %s\n", (unsigned long)state->pid,
-                 state->request->data.dsgetdcname.domain_name));
-
-       sendto_child(state, locator_child());
-}
-
-struct wbc_flag_map {
-       uint32_t wbc_dc_flag;
-       uint32_t ds_dc_flags;
-};
-
-static uint32_t get_dsgetdc_flags(uint32_t wbc_flags)
-{
-       struct wbc_flag_map lookup_dc_flags[] = {
-               { WBC_LOOKUP_DC_FORCE_REDISCOVERY, DS_FORCE_REDISCOVERY },
-               { WBC_LOOKUP_DC_DS_REQUIRED, DS_DIRECTORY_SERVICE_REQUIRED },
-               { WBC_LOOKUP_DC_DS_PREFERRED, DS_DIRECTORY_SERVICE_PREFERRED},
-               { WBC_LOOKUP_DC_GC_SERVER_REQUIRED, DS_GC_SERVER_REQUIRED },
-               { WBC_LOOKUP_DC_PDC_REQUIRED,  DS_PDC_REQUIRED},
-               { WBC_LOOKUP_DC_BACKGROUND_ONLY, DS_BACKGROUND_ONLY  },
-               { WBC_LOOKUP_DC_IP_REQUIRED, DS_IP_REQUIRED },
-               { WBC_LOOKUP_DC_KDC_REQUIRED, DS_KDC_REQUIRED },
-               { WBC_LOOKUP_DC_TIMESERV_REQUIRED, DS_TIMESERV_REQUIRED },
-               { WBC_LOOKUP_DC_WRITABLE_REQUIRED,  DS_WRITABLE_REQUIRED },
-               { WBC_LOOKUP_DC_GOOD_TIMESERV_PREFERRED, DS_GOOD_TIMESERV_PREFERRED },
-               { WBC_LOOKUP_DC_AVOID_SELF, DS_AVOID_SELF },
-               { WBC_LOOKUP_DC_ONLY_LDAP_NEEDED, DS_ONLY_LDAP_NEEDED },
-               { WBC_LOOKUP_DC_IS_FLAT_NAME, DS_IS_FLAT_NAME },
-               { WBC_LOOKUP_DC_IS_DNS_NAME, DS_IS_DNS_NAME },
-               { WBC_LOOKUP_DC_TRY_NEXTCLOSEST_SITE, DS_TRY_NEXTCLOSEST_SITE },
-               { WBC_LOOKUP_DC_DS_6_REQUIRED, DS_DIRECTORY_SERVICE_6_REQUIRED },
-               { WBC_LOOKUP_DC_RETURN_DNS_NAME, DS_RETURN_DNS_NAME },
-               { WBC_LOOKUP_DC_RETURN_FLAT_NAME, DS_RETURN_FLAT_NAME }
-       };
-       uint32_t ds_flags = 0;
-       int i = 0 ;
-       int num_entries = sizeof(lookup_dc_flags) / sizeof(struct wbc_flag_map);
-
-       for (i=0; i<num_entries; i++) {
-               if (wbc_flags & lookup_dc_flags[i].wbc_dc_flag)
-                       ds_flags |= lookup_dc_flags[i].ds_dc_flags;
-       }
-
-       return ds_flags;
-}
-
-static enum winbindd_result dual_dsgetdcname(struct winbindd_domain *domain,
-                                            struct winbindd_cli_state *state)
-{
-       NTSTATUS result;
-       struct netr_DsRGetDCNameInfo *info = NULL;
-       uint32_t ds_flags = 0;
-       struct GUID guid, *guid_ptr = NULL;
-       const char *guid_str = NULL;
-
-       state->request->data.dsgetdcname.domain_name
-               [sizeof(state->request->data.dsgetdcname.domain_name)-1] = '\0';
-       state->request->data.dsgetdcname.site_name
-               [sizeof(state->request->data.dsgetdcname.site_name)-1] = '\0';
-       state->request->data.dsgetdcname.domain_guid
-               [sizeof(state->request->data.dsgetdcname.domain_guid)-1] = '\0';
-
-       DEBUG(3, ("[%5lu]: dsgetdcname for %s\n", (unsigned long)state->pid,
-                 state->request->data.dsgetdcname.domain_name));
-
-       ds_flags = get_dsgetdc_flags(state->request->flags);
-
-       result = GUID_from_string(state->request->data.dsgetdcname.domain_guid,
-                                 &guid);
-       if (NT_STATUS_IS_OK(result) && !GUID_all_zero(&guid)) {
-               guid_ptr = &guid;
-       }
-
-       result = dsgetdcname(state->mem_ctx,
-                            winbind_messaging_context(),
-                            state->request->data.dsgetdcname.domain_name,
-                            guid_ptr,
-                            state->request->data.dsgetdcname.site_name,
-                            ds_flags,
-                            &info);
-
-       if (!NT_STATUS_IS_OK(result)) {
-               return WINBINDD_ERROR;
-       }
-
-       guid_str = GUID_string(state->mem_ctx, &info->domain_guid);
-       if (!guid_str) {
-               return WINBINDD_ERROR;
-       }
-
-       fstrcpy(state->response->data.dsgetdcname.dc_unc, info->dc_unc);
-       fstrcpy(state->response->data.dsgetdcname.dc_address, info->dc_address);
-       state->response->data.dsgetdcname.dc_address_type = info->dc_address_type;
-       fstrcpy(state->response->data.dsgetdcname.domain_guid, guid_str);
-       fstrcpy(state->response->data.dsgetdcname.domain_name, info->domain_name);
-       fstrcpy(state->response->data.dsgetdcname.forest_name, info->forest_name);
-       state->response->data.dsgetdcname.dc_flags = info->dc_flags;
-       fstrcpy(state->response->data.dsgetdcname.dc_site_name, info->dc_site_name);
-       fstrcpy(state->response->data.dsgetdcname.client_site_name, info->client_site_name);
-
-       return WINBINDD_OK;
-}
-
 static const struct winbindd_child_dispatch_table locator_dispatch_table[] = {
        {
                .name           = "PING",
                .struct_cmd     = WINBINDD_PING,
                .struct_fn      = winbindd_dual_ping,
-       },{
-               .name           = "DSGETDCNAME",
-               .struct_cmd     = WINBINDD_DSGETDCNAME,
-               .struct_fn      = dual_dsgetdcname,
        },{
                .name           = "NDRCMD",
                .struct_cmd     = WINBINDD_DUAL_NDRCMD,
@@ -172,3 +47,10 @@ static const struct winbindd_child_dispatch_table locator_dispatch_table[] = {
                .name           = NULL,
        }
 };
+
+void init_locator_child(void)
+{
+       setup_child(NULL, &static_locator_child,
+                   locator_dispatch_table,
+                   "log.winbindd", "locator");
+}