s3: Try to avoid dns searches with an empty site

[ira/wip.git] / source3 / libsmb / dsgetdcname.c

diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 5606b8e7c97fbfee38a7de628772b6db35fb32ae..76a52c8923a07cc13a784db3fea8285466830308 100644 (file)
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -133,10 +133,6 @@ static NTSTATUS dsgetdcname_cache_delete(TALLOC_CTX *mem_ctx,
 {
        char *key;
 
-       if (!gencache_init()) {
-               return NT_STATUS_INTERNAL_DB_ERROR;
-       }
-
        key = dsgetdcname_cache_key(mem_ctx, domain_name);
        if (!key) {
                return NT_STATUS_NO_MEMORY;
@@ -160,10 +156,6 @@ static NTSTATUS dsgetdcname_cache_store(TALLOC_CTX *mem_ctx,
        char *key;
        bool ret = false;
 
-       if (!gencache_init()) {
-               return NT_STATUS_INTERNAL_DB_ERROR;
-       }
-
        key = dsgetdcname_cache_key(mem_ctx, domain_name);
        if (!key) {
                return NT_STATUS_NO_MEMORY;
@@ -171,14 +163,8 @@ static NTSTATUS dsgetdcname_cache_store(TALLOC_CTX *mem_ctx,
 
        expire_time = time(NULL) + DSGETDCNAME_CACHE_TTL;
 
-       if (gencache_lock_entry(key) != 0) {
-               return NT_STATUS_LOCK_NOT_GRANTED;
-       }
-
        ret = gencache_set_data_blob(key, blob, expire_time);
 
-       gencache_unlock_entry(key);
-
        return ret ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
 }
 
@@ -239,28 +225,6 @@ static NTSTATUS store_cldap_reply(TALLOC_CTX *mem_ctx,
 /****************************************************************
 ****************************************************************/
 
-static NTSTATUS dsgetdcname_cache_refresh(TALLOC_CTX *mem_ctx,
-                                         struct messaging_context *msg_ctx,
-                                         const char *domain_name,
-                                         struct GUID *domain_guid,
-                                         uint32_t flags,
-                                         const char *site_name,
-                                         struct netr_DsRGetDCNameInfo *info)
-{
-       struct netr_DsRGetDCNameInfo *dc_info;
-
-       return dsgetdcname(mem_ctx,
-                          msg_ctx,
-                          domain_name,
-                          domain_guid,
-                          site_name,
-                          flags | DS_FORCE_REDISCOVERY,
-                          &dc_info);
-}
-
-/****************************************************************
-****************************************************************/
-
 static uint32_t get_cldap_reply_server_flags(struct netlogon_samlogon_response *r,
                                             uint32_t nt_version)
 {
@@ -350,11 +314,10 @@ static bool check_cldap_reply_required_flags(uint32_t ret_flags,
 
 static NTSTATUS dsgetdcname_cache_fetch(TALLOC_CTX *mem_ctx,
                                        const char *domain_name,
-                                       struct GUID *domain_guid,
+                                       const struct GUID *domain_guid,
                                        uint32_t flags,
                                        const char *site_name,
-                                       struct netr_DsRGetDCNameInfo **info_p,
-                                       bool *expired)
+                                       struct netr_DsRGetDCNameInfo **info_p)
 {
        char *key;
        DATA_BLOB blob;
@@ -363,17 +326,13 @@ static NTSTATUS dsgetdcname_cache_fetch(TALLOC_CTX *mem_ctx,
        struct NETLOGON_SAM_LOGON_RESPONSE_EX r;
        NTSTATUS status;
 
-       if (!gencache_init()) {
-               return NT_STATUS_INTERNAL_DB_ERROR;
-       }
-
        key = dsgetdcname_cache_key(mem_ctx, domain_name);
        if (!key) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (!gencache_get_data_blob(key, &blob, expired)) {
-               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       if (!gencache_get_data_blob(key, &blob, NULL, NULL)) {
+               return NT_STATUS_NOT_FOUND;
        }
 
        info = TALLOC_ZERO_P(mem_ctx, struct netr_DsRGetDCNameInfo);
@@ -422,17 +381,17 @@ static NTSTATUS dsgetdcname_cache_fetch(TALLOC_CTX *mem_ctx,
 static NTSTATUS dsgetdcname_cached(TALLOC_CTX *mem_ctx,
                                   struct messaging_context *msg_ctx,
                                   const char *domain_name,
-                                  struct GUID *domain_guid,
+                                  const struct GUID *domain_guid,
                                   uint32_t flags,
                                   const char *site_name,
                                   struct netr_DsRGetDCNameInfo **info)
 {
        NTSTATUS status;
-       bool expired = false;
 
        status = dsgetdcname_cache_fetch(mem_ctx, domain_name, domain_guid,
-                                        flags, site_name, info, &expired);
-       if (!NT_STATUS_IS_OK(status)) {
+                                        flags, site_name, info);
+       if (!NT_STATUS_IS_OK(status)
+           && !NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
                DEBUG(10,("dsgetdcname_cached: cache fetch failed with: %s\n",
                        nt_errstr(status)));
                return NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
@@ -442,14 +401,19 @@ static NTSTATUS dsgetdcname_cached(TALLOC_CTX *mem_ctx,
                return status;
        }
 
-       if (expired) {
-               status = dsgetdcname_cache_refresh(mem_ctx, msg_ctx,
-                                                  domain_name,
-                                                  domain_guid, flags,
-                                                  site_name, *info);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
+               struct netr_DsRGetDCNameInfo *dc_info;
+
+               status = dsgetdcname(mem_ctx, msg_ctx, domain_name,
+                                    domain_guid, site_name,
+                                    flags | DS_FORCE_REDISCOVERY,
+                                    &dc_info);
+
                if (!NT_STATUS_IS_OK(status)) {
                        return status;
                }
+
+               *info = dc_info;
        }
 
        return status;
@@ -563,7 +527,7 @@ static NTSTATUS discover_dc_netbios(TALLOC_CTX *mem_ctx,
 
 static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
                                const char *domain_name,
-                               struct GUID *domain_guid,
+                               const struct GUID *domain_guid,
                                uint32_t flags,
                                const char *site_name,
                                struct ip_service_name **returned_dclist,
@@ -626,13 +590,14 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
 
                struct ip_service_name *r = &dclist[count];
 
-               r->port = dcs[count].port;
-               r->hostname = dcs[count].hostname;
+               r->port = dcs[i].port;
+               r->hostname = dcs[i].hostname;
 
                /* If we don't have an IP list for a name, lookup it up */
 
                if (!dcs[i].ss_s) {
-                       interpret_string_addr(&r->ss, dcs[i].hostname, 0);
+                       interpret_string_addr_prefer_ipv4(&r->ss,
+                                               dcs[i].hostname, 0);
                        i++;
                        j = 0;
                } else {
@@ -721,7 +686,7 @@ static NTSTATUS make_domain_controller_info(TALLOC_CTX *mem_ctx,
        if (forest_name && *forest_name) {
                info->forest_name = talloc_strdup(mem_ctx, forest_name);
                NT_STATUS_HAVE_NO_MEMORY(info->forest_name);
-               flags |= DS_DNS_FOREST;
+               flags |= DS_DNS_FOREST_ROOT;
        }
 
        info->dc_flags = flags;
@@ -992,7 +957,7 @@ static NTSTATUS process_dc_netbios(TALLOC_CTX *mem_ctx,
                ip_list.ss = dclist[i].ss;
                ip_list.port = 0;
 
-               if (!interpret_string_addr(&ss, dclist[i].hostname, AI_NUMERICHOST)) {
+               if (!interpret_string_addr_prefer_ipv4(&ss, dclist[i].hostname, AI_NUMERICHOST)) {
                        return NT_STATUS_UNSUCCESSFUL;
                }
 
@@ -1068,7 +1033,7 @@ static NTSTATUS process_dc_netbios(TALLOC_CTX *mem_ctx,
 static NTSTATUS dsgetdcname_rediscover(TALLOC_CTX *mem_ctx,
                                       struct messaging_context *msg_ctx,
                                       const char *domain_name,
-                                      struct GUID *domain_guid,
+                                      const struct GUID *domain_guid,
                                       uint32_t flags,
                                       const char *site_name,
                                       struct netr_DsRGetDCNameInfo **info)
@@ -1149,7 +1114,7 @@ static bool is_closest_site(struct netr_DsRGetDCNameInfo *info)
 NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
                     struct messaging_context *msg_ctx,
                     const char *domain_name,
-                    struct GUID *domain_guid,
+                    const struct GUID *domain_guid,
                     const char *site_name,
                     uint32_t flags,
                     struct netr_DsRGetDCNameInfo **info)
@@ -1173,7 +1138,7 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       if (!site_name) {
+       if ((site_name == NULL) || (site_name[0] == '\0')) {
                query_site = sitename_fetch(domain_name);
        } else {
                query_site = SMB_STRDUP(site_name);