Merge branch '2.1-oracle-compat' into develop-new-merge-oracle

2017-06-28 22:30:16 +02:00
parent 14bb6cf99b 7f1a949198
commit 6cd6ded3d8
88 changed files with 15138 additions and 745 deletions
--- a/server/core/utils.cc
+++ b/server/core/utils.cc
@ -245,8 +245,6 @@ void gw_str_xor(uint8_t *output, const uint8_t *input1, const uint8_t *input2, u
    {
        *output++ = *input1++ ^ *input2++;
    }
-
-    *output = '\0';
 }

 /**********************************************************