From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 10 Mar 2021 14:54:14 +0000 (+0100)
Subject: Revert "BUG/MINOR: resolvers: Only renew TTL for SRV records with an additional record"
X-Git-Tag: v2.4-dev12~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5037c06d91e0ed748932fcfaae11eeadf5949957;p=thirdparty%2Fhaproxy.git

Revert "BUG/MINOR: resolvers: Only renew TTL for SRV records with an additional record"

This reverts commit a331a1e8eb2ad4750711a477ca3e22d940495faf.

This commit fixes a real bug, but it also reveals some hidden bugs, mostly
because of some design issues. Thus, in itself, it create more problem than
it solves. So revert it for now. All known bugs will be addressed in next
commits.

This patch should be backported as far as 2.2.
---

diff --git a/src/resolvers.c b/src/resolvers.c
index 7dcb8f8d8e..68e3e21788 100644
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -1046,8 +1046,7 @@ static int resolv_validate_dns_response(unsigned char *resp, unsigned char *bufe
 		}
 
 		if (found == 1) {
-			if (tmp_record->type != DNS_RTYPE_SRV || tmp_record->ar_item != NULL)
-				tmp_record->last_seen = now.tv_sec;
+			tmp_record->last_seen = now.tv_sec;
 			pool_free(resolv_answer_item_pool, answer_record);
 			answer_record = NULL;
 		}
@@ -1239,7 +1238,6 @@ static int resolv_validate_dns_response(unsigned char *resp, unsigned char *bufe
 					if (tmp_record->ar_item)
 						pool_free(resolv_answer_item_pool, tmp_record->ar_item);
 					tmp_record->ar_item = answer_record;
-					tmp_record->last_seen = answer_record->last_seen;
 					answer_record = NULL;
 					break;
 				}