mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 22:31:28 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: spoe: Don't compare engine name and SPOE scope when both are NULL

Browse Source 
SPOE filter can be declared without engine name. This is an optional
parameter. But in this case, no scope must be used in the SPOE configuration
file. So engine name and scope are both undefined, and, obviously, we must not
try to compare them.

This patch must be backported in 1.7.
This commit is contained in:
Christopher Faulet 2017-09-19 10:35:35 +02:00 committed by Willy Tarreau
parent d22e83abd9
commit e1405e5f80
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/flt_spoe.c
View File

@ -2967,7 +2967,7 @@ cfg_parse_spoe_agent(const char *file, int linenum, char **args, int kwm)
if ((cfg_scope == NULL && curengine != NULL) ||
(cfg_scope != NULL && curengine == NULL) ||
strcmp(curengine, cfg_scope))
(curengine != NULL && cfg_scope != NULL && strcmp(curengine, cfg_scope)))
goto out;
if (!strcmp(args[0], "spoe-agent")) { /* new spoe-agent section */
@ -3274,7 +3274,7 @@ cfg_parse_spoe_message(const char *file, int linenum, char **args, int kwm)
if ((cfg_scope == NULL && curengine != NULL) ||
(cfg_scope != NULL && curengine == NULL) ||
strcmp(curengine, cfg_scope))
(curengine != NULL && cfg_scope != NULL && strcmp(curengine, cfg_scope)))
goto out;
if (!strcmp(args[0], "spoe-message")) { /* new spoe-message section */