Merge branch '2.2' into 2.3

2019-05-28 14:17:43 +03:00
parent edb669100d 3721d6abf2
commit bef8881cab
2 changed files with 14 additions and 7 deletions
--- a/server/modules/routing/avrorouter/rpl.cc
+++ b/server/modules/routing/avrorouter/rpl.cc
@ -1120,7 +1120,7 @@ static bool token_is_keyword(const char* tok, int len)
 {
    for (int i = 0; keywords[i]; i++)
    {
-        if (strncasecmp(keywords[i], tok, len) == 0)
+        if (strncasecmp(keywords[i], tok, len) == 0 && strlen(keywords[i]) == len)
        {
            return true;
        }