From 689784ed91b8af39c9efd32627efe424e7ee6da9 Mon Sep 17 00:00:00 2001 From: Aurelien DARRAGON Date: Thu, 28 Dec 2023 12:13:48 +0100 Subject: [PATCH] CLEANUP: resolvers: remove some more unused RSLV_UDP flags RSLV_UPD_CNAME and RSLV_UPD_NAME_ERROR flags have now become useless since 3cf7f987 ("MINOR: dns: proper domain name validation when receiving DNS response") as they are never set, but we forgot to remove them. --- include/haproxy/resolvers-t.h | 2 -- src/server.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/include/haproxy/resolvers-t.h b/include/haproxy/resolvers-t.h index 486c9641c..e10c6fa21 100644 --- a/include/haproxy/resolvers-t.h +++ b/include/haproxy/resolvers-t.h @@ -274,8 +274,6 @@ enum { * OR provided IP found and preference is not match and an IP * matching preference was found. */ - RSLV_UPD_CNAME, /* CNAME without any IP provided in the response */ - RSLV_UPD_NAME_ERROR, /* name in the response did not match the query */ RSLV_UPD_NO_IP_FOUND, /* no IP could be found in the response */ }; diff --git a/src/server.c b/src/server.c index bc838b3b9..d5531778b 100644 --- a/src/server.c +++ b/src/server.c @@ -4424,12 +4424,6 @@ int snr_resolution_cb(struct resolv_requester *requester, struct dns_counters *c has_no_ip = 1; goto update_status; - case RSLV_UPD_NAME_ERROR: - /* update resolution status to OTHER error type */ - resolution->status = RSLV_STATUS_OTHER; - has_no_ip = 1; - goto update_status; - default: has_no_ip = 1; goto invalid;