Merge branch '2.3' into develop

2019-06-03 13:46:13 +03:00
parent 625741d8ba c219187a1e
commit 44d1b821c3
24 changed files with 357 additions and 57 deletions
--- a/server/modules/filter/dbfwfilter/dbfwfilter.hh
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.hh
@ -305,7 +305,7 @@ class Rule;
 typedef std::shared_ptr<Rule> SRule;

 /** Helper function for strdup'ing in printf style */
-char* create_error(const char* format, ...);
+char* create_error(const char* format, ...) __attribute__ ((nonnull));

 /**
 * Check if a rule matches