- Removed all #ifdef PCRS

 - Removed vim-settings

diff --git a/loadcfg.c b/loadcfg.c
index 91670bb..67b2bb1 100644 (file)
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,5 +1,4 @@
-/* vim:ts=3: */
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.16 2001/06/09 10:55:28 jongfoster Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.17 2001/06/29 13:31:03 oes Exp $";

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


@@ -36,6 +35,16 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.16 2001/06/09 10:55:28 jongfoster
  *
  * Revisions   :
  *    $Log: loadcfg.c,v $
  *
  * Revisions   :
  *    $Log: loadcfg.c,v $

+ *    Revision 1.17  2001/06/29 13:31:03  oes
+ *    - Improved comments
+ *    - Fixed (actionsfile) and sorted hashes
+ *    - Introduced admin_address and proxy-info-url
+ *      as config parameters
+ *    - Renamed config->proxy_args_invocation (which didn't have
+ *      the invocation but the options!) to config->proxy_args
+ *    - Various adaptions
+ *    - Removed logentry from cancelled commit
+ *

  *    Revision 1.16  2001/06/09 10:55:28  jongfoster
  *    Changing BUFSIZ ==> BUFFER_SIZE
  *
  *    Revision 1.16  2001/06/09 10:55:28  jongfoster
  *    Changing BUFSIZ ==> BUFFER_SIZE
  *


@@ -369,9 +378,7 @@ void unload_configfile (void * data)
    freez((char *)config->suppress_message);
 #endif /* ndef SPLIT_PROXY_ARGS */
 
    freez((char *)config->suppress_message);
 #endif /* ndef SPLIT_PROXY_ARGS */
 

-#ifdef PCRS

    freez((char *)config->re_filterfile);
    freez((char *)config->re_filterfile);

-#endif /* def PCRS */

 
 }
 
 
 }
 


@@ -958,12 +965,10 @@ struct configuration_spec * load_config(void)
  * re_filterfile file-name
  * In confdir by default.
  ****************************************************************************/
  * re_filterfile file-name
  * In confdir by default.
  ****************************************************************************/

-#ifdef PCRS

          case hash_re_filterfile :
             freez((char *)config->re_filterfile);
             config->re_filterfile = make_path(config->confdir, arg);
             continue;
          case hash_re_filterfile :
             freez((char *)config->re_filterfile);
             config->re_filterfile = make_path(config->confdir, arg);
             continue;

-#endif /* def PCRS */

 
 /****************************************************************************
  * single-threaded
 
 /****************************************************************************
  * single-threaded


@@ -1118,9 +1123,6 @@ struct configuration_spec * load_config(void)
 #ifndef ACL_FILES
          case hash_permit_access:
 #endif /* ndef ACL_FILES */
 #ifndef ACL_FILES
          case hash_permit_access:
 #endif /* ndef ACL_FILES */

-#ifndef PCRS
-         case hash_re_filterfile :
-#endif /* ndef PCRS */

 #ifdef SPLIT_PROXY_ARGS
          case hash_suppress_blocklists :
 #endif /* def SPLIT_PROXY_ARGS */
 #ifdef SPLIT_PROXY_ARGS
          case hash_suppress_blocklists :
 #endif /* def SPLIT_PROXY_ARGS */


@@ -1179,12 +1181,10 @@ struct configuration_spec * load_config(void)
       add_loader(load_actions_file, config);
    }
 
       add_loader(load_actions_file, config);
    }
 

-#ifdef PCRS

    if (config->re_filterfile)
    {
       add_loader(load_re_filterfile, config);
    }
    if (config->re_filterfile)
    {
       add_loader(load_re_filterfile, config);
    }

-#endif /* def PCRS */

 
 #ifdef TRUST_FILES
    if (config->trustfile)
 
 #ifdef TRUST_FILES
    if (config->trustfile)


@@ -1260,9 +1260,8 @@ struct configuration_spec * load_config(void)
 #if defined(_WIN32) && !defined (_WIN_CONSOLE)
 
    g_actions_file     = config->actions_file;
 #if defined(_WIN32) && !defined (_WIN_CONSOLE)
 
    g_actions_file     = config->actions_file;

-#ifdef PCRS

    g_re_filterfile    = config->re_filterfile;
    g_re_filterfile    = config->re_filterfile;

-#endif
+

 #ifdef TRUST_FILES
    g_trustfile        = config->trustfile;
 #endif
 #ifdef TRUST_FILES
    g_trustfile        = config->trustfile;
 #endif