From e1405e5f802123eec8270ab87d6e9637c40dfd6a Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Tue, 19 Sep 2017 10:35:35 +0200 Subject: [PATCH] BUG/MINOR: spoe: Don't compare engine name and SPOE scope when both are NULL 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. --- src/flt_spoe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/flt_spoe.c b/src/flt_spoe.c index 228770c9a..abaded156 100644 --- a/src/flt_spoe.c +++ b/src/flt_spoe.c @@ -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 */