BUG/MINOR: resolvers: Reset server address on DNS error only on status change

When a DNS resolution error is detected, in snr_resolution_error_cb(), the
server address must be reset only if the server status has changed. It this
case, it means the server is set to RMAINT. Thus the server address may by
reset.

This patch fixes a bug introduced by commit d127ffa9f ("BUG/MEDIUM:
resolvers: Reset address for unresolved servers"). It must be backported as
far as 2.0.

diff --git a/src/server.c b/src/server.c
index 18996a016fa0eb06cd323b6652c1caf1ebc33d13..c577dc8e807b6b59566081210fa85fba27ae6332 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -3293,8 +3293,8 @@ int snr_resolution_error_cb(struct resolv_requester *requester, int error_code)
        if (!s)
                return 1;
        HA_SPIN_LOCK(SERVER_LOCK, &s->lock);
-       snr_update_srv_status(s, 1);
-       memset(&s->addr, 0, sizeof(s->addr));
+       if (!snr_update_srv_status(s, 1))
+               memset(&s->addr, 0, sizeof(s->addr));
        HA_SPIN_UNLOCK(SERVER_LOCK, &s->lock);
        return 1;
 }