dsgetdcname: simply call ourself with DS_FORCE_REDISCOVERY after cache expiry.

Guenther
(This used to be commit 847f258632f6d49a3fd45f466c5d3d8c6222ff85)

diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 388c7be39524a0f0943135cb9f59277ade4c4cec..247cfd3526555e69ec5f11d3a29e80a2e281b93b 100644 (file)
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -196,22 +196,14 @@ static NTSTATUS dsgetdcname_cache_refresh(TALLOC_CTX *mem_ctx,
                                          const char *site_name,
                                          struct netr_DsRGetDCNameInfo *info)
 {
-       uint32_t nt_version = NETLOGON_VERSION_1;
-
-       /* check if matching entry is older then 15 minutes, if yes, send
-        * CLDAP/MAILSLOT ping again and store the cached data */
-
-       if (ads_cldap_netlogon(mem_ctx, info->dc_unc,
-                              info->domain_name, &nt_version, NULL)) {
-
-               dsgetdcname_cache_delete(mem_ctx, domain_name);
-
-               return dsgetdcname_cache_store(mem_ctx,
-                                              info->domain_name,
-                                              info);
-       }
-
-       return NT_STATUS_INVALID_NETWORK_RESPONSE;
+       struct netr_DsRGetDCNameInfo *dc_info;
+
+       return dsgetdcname(mem_ctx,
+                          domain_name,
+                          domain_guid,
+                          site_name,
+                          flags | DS_FORCE_REDISCOVERY,
+                          &dc_info);
 }
 
 /****************************************************************