From: Baptiste Assmann <bassmann@haproxy.com>
Date: Mon, 21 Aug 2017 14:09:59 +0000 (+0200)
Subject: CLEANUP: dns: remove duplicated code in dns_resolve_recv()
X-Git-Tag: v1.8-dev3~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60e9c264c961bacf95ad4bd20f2df60f77330ace;p=thirdparty%2Fhaproxy.git

CLEANUP: dns: remove duplicated code in dns_resolve_recv()

by mistake, I duplicated a block when introductiing the list_for_each loop
on a resolution's requester list.
---

diff --git a/src/dns.c b/src/dns.c
index bc463ee630..82c7329916 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -633,36 +633,8 @@ void dns_resolve_recv(struct dgram_conn *dgram)
 							    "%d", item1->weight);
 							server_parse_weight_change_request(srv, weight);
 						}
-
 					}
 				}
-				/* If not, try to find a server that is down */
-				if (!srv) {
-					for (srv = srvrq->proxy->srv; srv != NULL; srv = srv->next) {
-
-						if (srv->srvrq == srvrq &&
-						    !srv->hostname_dn)
-							break;
-					}
-					if (srv) {
-						char weight[9];
-
-						char hostname[DNS_MAX_NAME_SIZE];
-
-						if (item1->data_len > DNS_MAX_NAME_SIZE)
-							continue;
-						dns_dn_label_to_str(item1->target, hostname, item1->data_len);
-						update_server_fqdn(srv, hostname, "SRV record");
-						srv->svc_port = item1->port;
-						srv->flags &= ~SRV_F_MAPPORTS;
-						if ((srv->check.state & CHK_ST_CONFIGURED) && !(srv->flags & SRV_F_CHECKPORT))
-							srv->check.port = item1->port;
-						snprintf(weight, sizeof(weight),
-						    "%d", item1->weight);
-						server_parse_weight_change_request(srv, weight);
-					}
-
-				}
 			}
 		}
 		if (removed_reso)