From: Nenad Merdanovic <nmerdan@haproxy.com>
Date: Tue, 5 Sep 2017 13:32:47 +0000 (+0200)
Subject: BUG/MINOR: server: Remove FQDN requirement for using init-addr and state file
X-Git-Tag: v1.8-dev3~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19e8aa58f7c42e602a95b4ceb4b254c424aed11c;p=thirdparty%2Fhaproxy.git

BUG/MINOR: server: Remove FQDN requirement for using init-addr and state file

Historically the DNS was the only way of updating the server IP dynamically
and the init-addr processing and state file load required the server to have
an FQDN defined. Given that we can now update the IP through the socket as
well and also can have different init-addr values (like IP and 'none') - this
requirement needs to be removed.

This patch should be backported to 1.7.
---

diff --git a/src/server.c b/src/server.c
index c80c987006..67870b8dd1 100644
--- a/src/server.c
+++ b/src/server.c
@@ -4276,8 +4276,7 @@ int srv_init_addr(void)
 			goto srv_init_addr_next;
 
 		for (srv = curproxy->srv; srv; srv = srv->next)
-			if (srv->hostname)
-				return_code |= srv_iterate_initaddr(srv);
+			return_code |= srv_iterate_initaddr(srv);
 
  srv_init_addr_next:
 		curproxy = curproxy->next;