Rename load_actions_file() and load_re_filterfile()

as they load multiple files "now".

diff --git a/actions.c b/actions.c
index 7de2fef..2f87768 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -1,4 +1,4 @@
-const char actions_rcs[] = "$Id: actions.c,v 1.48 2008/03/28 18:17:14 fabiankeil Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.49 2008/03/29 12:13:45 fabiankeil Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $


@@ -33,6 +33,9 @@ const char actions_rcs[] = "$Id: actions.c,v 1.48 2008/03/28 18:17:14 fabiankeil
  *
  * Revisions   :
  *    $Log: actions.c,v $
  *
  * Revisions   :
  *    $Log: actions.c,v $

+ *    Revision 1.49  2008/03/29 12:13:45  fabiankeil
+ *    Remove send-wafer and send-vanilla-wafer actions.
+ *

  *    Revision 1.48  2008/03/28 18:17:14  fabiankeil
  *    In action_used_to_be_valid(), loop through an array of formerly
  *    valid actions instead of using an OR-chain of strcmpic() calls.
  *    Revision 1.48  2008/03/28 18:17:14  fabiankeil
  *    In action_used_to_be_valid(), loop through an array of formerly
  *    valid actions instead of using an OR-chain of strcmpic() calls.


@@ -1219,7 +1222,7 @@ void free_alias_list(struct action_alias *alias_list)
 
 /*********************************************************************
  *
 
 /*********************************************************************
  *

- * Function    :  load_actions_file
+ * Function    :  load_action_files

  *
  * Description :  Read and parse all the action files and add to files
  *                list.
  *
  * Description :  Read and parse all the action files and add to files
  *                list.


@@ -1230,7 +1233,7 @@ void free_alias_list(struct action_alias *alias_list)
  * Returns     :  0 => Ok, everything else is an error.
  *
  *********************************************************************/
  * Returns     :  0 => Ok, everything else is an error.
  *
  *********************************************************************/

-int load_actions_file(struct client_state *csp)
+int load_action_files(struct client_state *csp)

 {
    int i;
    int result;
 {
    int i;
    int result;

diff --git a/actions.h b/actions.h
index ea6041f..b6f60db 100644 (file)
--- a/actions.h
+++ b/actions.h
@@ -1,6 +1,6 @@
 #ifndef ACTIONS_H_INCLUDED
 #define ACTIONS_H_INCLUDED
 #ifndef ACTIONS_H_INCLUDED
 #define ACTIONS_H_INCLUDED

-#define ACTIONS_H_VERSION "$Id: actions.h,v 1.16 2007/04/17 18:21:45 fabiankeil Exp $"
+#define ACTIONS_H_VERSION "$Id: actions.h,v 1.17 2008/01/28 20:17:40 fabiankeil Exp $"

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.h,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.h,v $


@@ -35,6 +35,10 @@
  *
  * Revisions   :
  *    $Log: actions.h,v $
  *
  * Revisions   :
  *    $Log: actions.h,v $

+ *    Revision 1.17  2008/01/28 20:17:40  fabiankeil
+ *    - Mark some parameters as immutable.
+ *    - Hide update_action_bits_for_all_tags() while it's unused.
+ *

  *    Revision 1.16  2007/04/17 18:21:45  fabiankeil
  *    Split update_action_bits() into
  *    update_action_bits_for_all_tags()
  *    Revision 1.16  2007/04/17 18:21:45  fabiankeil
  *    Split update_action_bits() into
  *    update_action_bits_for_all_tags()


@@ -154,7 +158,7 @@ extern char * current_action_to_html(const struct client_state *csp,
 
 extern jb_err get_action_token(char **line, char **name, char **value);
 extern void unload_actions_file(void *file_data);
 
 extern jb_err get_action_token(char **line, char **name, char **value);
 extern void unload_actions_file(void *file_data);

-extern int load_actions_file(struct client_state *csp);
+extern int load_action_files(struct client_state *csp);

 
 #ifdef FEATURE_GRACEFUL_TERMINATION
 void unload_current_actions_file(void);
 
 #ifdef FEATURE_GRACEFUL_TERMINATION
 void unload_current_actions_file(void);

diff --git a/loadcfg.c b/loadcfg.c
index 311a431..6509746 100644 (file)
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.73 2008/02/16 16:54:51 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.74 2008/03/26 18:07:07 fabiankeil Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $


@@ -35,6 +35,9 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.73 2008/02/16 16:54:51 fabiankeil
  *
  * Revisions   :
  *    $Log: loadcfg.c,v $
  *
  * Revisions   :
  *    $Log: loadcfg.c,v $

+ *    Revision 1.74  2008/03/26 18:07:07  fabiankeil
+ *    Add hostname directive. Closes PR#1918189.
+ *

  *    Revision 1.73  2008/02/16 16:54:51  fabiankeil
  *    Fix typo.
  *
  *    Revision 1.73  2008/02/16 16:54:51  fabiankeil
  *    Fix typo.
  *


@@ -1678,12 +1681,12 @@ struct configuration_spec * load_config(void)
 
    if (config->actions_file[0])
    {
 
    if (config->actions_file[0])
    {

-      add_loader(load_actions_file, config);
+      add_loader(load_action_files, config);

    }
 
    }
 

-   if (config->re_filterfile)
+   if (config->re_filterfile[0])

    {
    {

-      add_loader(load_re_filterfile, config);
+      add_loader(load_re_filterfiles, config);

    }
 
 #ifdef FEATURE_TRUST
    }
 
 #ifdef FEATURE_TRUST

diff --git a/loaders.c b/loaders.c
index 9667c1c..88564dc 100644 (file)
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,4 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.65 2007/12/07 18:29:23 fabiankeil Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.66 2008/03/21 11:16:30 fabiankeil Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $


@@ -35,6 +35,9 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.65 2007/12/07 18:29:23 fabiankeil
  *
  * Revisions   :
  *    $Log: loaders.c,v $
  *
  * Revisions   :
  *    $Log: loaders.c,v $

+ *    Revision 1.66  2008/03/21 11:16:30  fabiankeil
+ *    Garbage-collect csp->my_ip_addr_str and csp->my_hostname.
+ *

  *    Revision 1.65  2007/12/07 18:29:23  fabiankeil
  *    Remove now-obsolete csp member x_forwarded.
  *
  *    Revision 1.65  2007/12/07 18:29:23  fabiankeil
  *    Remove now-obsolete csp member x_forwarded.
  *


@@ -1381,9 +1384,9 @@ void unload_current_re_filterfile(void)
 
 /*********************************************************************
  *
 
 /*********************************************************************
  *

- * Function    :  load_re_filterfile
+ * Function    :  load_re_filterfiles

  *
  *

- * Description :  Load the re_filterfile. 
+ * Description :  Loads all the filterfiles. 

  *                Generate a chained list of re_filterfile_spec's from
  *                the "FILTER: " blocks, compiling all their substitutions
  *                into chained lists of pcrs_job structs.
  *                Generate a chained list of re_filterfile_spec's from
  *                the "FILTER: " blocks, compiling all their substitutions
  *                into chained lists of pcrs_job structs.


@@ -1394,7 +1397,7 @@ void unload_current_re_filterfile(void)
  * Returns     :  0 => Ok, everything else is an error.
  *
  *********************************************************************/
  * Returns     :  0 => Ok, everything else is an error.
  *
  *********************************************************************/

-int load_re_filterfile(struct client_state *csp)
+int load_re_filterfiles(struct client_state *csp)

 {
    int i;
    int result;
 {
    int i;
    int result;

diff --git a/loaders.h b/loaders.h
index 125d235..30be639 100644 (file)
--- a/loaders.h
+++ b/loaders.h
@@ -1,6 +1,6 @@
 #ifndef LOADERS_H_INCLUDED
 #define LOADERS_H_INCLUDED
 #ifndef LOADERS_H_INCLUDED
 #define LOADERS_H_INCLUDED

-#define LOADERS_H_VERSION "$Id: loaders.h,v 1.21 2006/07/18 14:48:46 david__schmidt Exp $"
+#define LOADERS_H_VERSION "$Id: loaders.h,v 1.22 2007/06/01 14:12:38 fabiankeil Exp $"

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.h,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.h,v $


@@ -37,6 +37,9 @@
  *
  * Revisions   :
  *    $Log: loaders.h,v $
  *
  * Revisions   :
  *    $Log: loaders.h,v $

+ *    Revision 1.22  2007/06/01 14:12:38  fabiankeil
+ *    Add unload_forward_spec() in preparation for forward-override{}.
+ *

  *    Revision 1.21  2006/07/18 14:48:46  david__schmidt
  *    Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
  *    with what was really the latest development (the v_3_0_branch branch)
  *    Revision 1.21  2006/07/18 14:48:46  david__schmidt
  *    Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
  *    with what was really the latest development (the v_3_0_branch branch)


@@ -206,8 +209,8 @@ extern jb_err simple_read_line(FILE *fp, char **dest, int *newline);
 
 
 extern short int MustReload;
 
 
 extern short int MustReload;

-extern int load_actions_file(struct client_state *csp);
-extern int load_re_filterfile(struct client_state *csp);
+extern int load_action_files(struct client_state *csp);
+extern int load_re_filterfiles(struct client_state *csp);

 
 #ifdef FEATURE_TRUST
 extern int load_trustfile(struct client_state *csp);
 
 #ifdef FEATURE_TRUST
 extern int load_trustfile(struct client_state *csp);