MINOR: haproxy: always protocol unbind on startup error path
In haproxy startup, all init error paths after the protocol bind step
cautiously call protocol_unbind_all() before exiting except one that was
conditional. We're not making an exception to the rule and we now properly
call protocol_unbind_all() as well.
No backport needed as this patch is unnoticeable.
diff --git a/src/haproxy.c b/src/haproxy.c
index 308f418..a1399f9 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -3381,10 +3381,9 @@
/* Note: protocol_bind_all() sends an alert when it fails. */
if ((err & ~ERR_WARN) != ERR_NONE) {
ha_alert("[%s.main()] Some protocols failed to start their listeners! Exiting.\n", argv[0]);
- if (retry != MAX_START_RETRIES && nb_oldpids) {
- protocol_unbind_all(); /* cleanup everything we can */
+ if (retry != MAX_START_RETRIES && nb_oldpids)
tell_old_pids(SIGTTIN);
- }
+ protocol_unbind_all(); /* cleanup everything we can */
exit(1);
}