| commit | 55dcdf4c398b805770914ecfbe095c3b1b309ca2 | [log] [tgz] |
|---|---|---|
| author | Olivier Houchard <ohouchard@haproxy.com> | Mon Nov 06 15:15:04 2017 +0100 |
| committer | Willy Tarreau <w@1wt.eu> | Mon Nov 06 18:34:24 2017 +0100 |
| tree | 39abf773980d9039fa080b542d70ebc5d1bba38a | |
| parent | f0c531ab5516d179a83a44b1a34b26ffde5e2f51 [diff] [blame] |
BUG/MINOR: dns: Don't try to get the server lock if it's already held. dns_link_resolution() can be called with the server lock already held, so don't attempt to lock it again in that case.
diff --git a/src/server.c b/src/server.c index ed78ca5..adc9fd4 100644 --- a/src/server.c +++ b/src/server.c
@@ -3818,7 +3818,7 @@ if (!srv->hostname || !srv->hostname_dn) goto err; - if (dns_link_resolution(srv, OBJ_TYPE_SERVER) == -1) + if (dns_link_resolution(srv, OBJ_TYPE_SERVER, 1) == -1) goto err; end: