Add the filter-file loaders before the action-file loaders

This way all filters are loaded by the time the action files
are parsed and filter{} actions specifying non-existent filters
can be detected and rejected (with code not yet committed).

diff --git a/loadcfg.c b/loadcfg.c
index 235281b..d7f9db6 100644 (file)
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.117 2011/07/08 13:30:08 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.120 2011/07/19 11:00:20 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -1525,14 +1525,14 @@ struct configuration_spec * load_config(void)
       log_error(LOG_LEVEL_FATAL, "Out of memory loading config - insufficient memory for config->proxy_args");
    }
 
-   if (config->actions_file[0])
+   if (config->re_filterfile[0])
    {
-      add_loader(load_action_files, config);
+      add_loader(load_re_filterfiles, config);
    }
 
-   if (config->re_filterfile[0])
+   if (config->actions_file[0])
    {
-      add_loader(load_re_filterfiles, config);
+      add_loader(load_action_files, config);
    }
 
 #ifdef FEATURE_TRUST