@@ -255,37 +255,40 @@ ngx_http_modsecurity_merge_loc_conf(ngx_conf_t *cf, void *parent,
255255 if (c -> rules_remote_server .len != 0 )
256256 {
257257 int res ;
258- const char * error ;
258+ const char * error = NULL ;
259259 const char * rules_remote_server = ngx_str_to_char (c -> rules_remote_server , cf -> pool );
260260 const char * rules_remote_key = ngx_str_to_char (c -> rules_remote_key , cf -> pool );
261261 res = msc_rules_add_remote (c -> rules_set , rules_remote_key , rules_remote_server , & error );
262262 dd ("Loading rules from: '%s'" , rules_remote_server );
263- if (res == 0 ) {
264- dd ("Failed to load the rules from: '%s'" , rules_remote_server );
263+ if (res < 0 ) {
264+ dd ("Failed to load the rules from: '%s' - reason: '%s'" , rules_remote_server , error );
265+
265266 return strdup (error );
266267 }
267-
268+ msc_rules_dump (c -> rules_set );
269+ dd ("Loaded '%d' rules." , res );
268270 }
269271 else if (c -> rules_file .len != 0 )
270272 {
271273 int res ;
272- const char * error ;
274+ const char * error = NULL ;
273275 char * rules_set = ngx_str_to_char (c -> rules_file , cf -> pool );
274276 res = msc_rules_add_file (c -> rules_set , rules_set , & error );
275277 dd ("Loading rules from: '%s'" , rules_set );
276- if (res == 0 ) {
277- dd ("Failed to load the rules from: '%s'" , rules_set );
278+ if (res < 0 ) {
279+ dd ("Failed to load the rules from: '%s' - reason: '%s' " , rules_set , error );
278280 return strdup (error );
279281 }
282+ dd ("Loaded '%d' rules." , res );
280283 }
281284 else if (c -> rules .len != 0 )
282285 {
283286 int res ;
284- const char * error ;
287+ const char * error = NULL ;
285288 char * rules = ngx_str_to_char (c -> rules , cf -> pool );
286289 res = msc_rules_add (c -> rules_set , rules , & error );
287290 dd ("Loading rules: '%s'" , rules );
288- if (res == 0 ) {
291+ if (res < 0 ) {
289292 dd ("Failed to load the rules: '%s'" , rules );
290293 return strdup (error );
291294 }
0 commit comments