Branch: Tag:

1997-08-13

1997-08-13 21:37:39 by Per Hedbor <ph@opera.com>

Fixes

Rev: server/base_server/config/describers.pike:1.36
Rev: server/base_server/configuration.pike:1.54
Rev: server/base_server/mainconfig.pike:1.65
Rev: server/base_server/read_config.pike:1.12
Rev: server/base_server/roxen.pike:1.99
Rev: server/config_actions/changepass.pike:1.3
Rev: server/config_actions/openports.pike:1.1
Rev: server/config_actions/reloadconfiginterface.pike:1.1
Rev: server/config_actions/reloadconfigurations.pike:1.2
Rev: server/config_actions/shutdown.pike:1.5
Rev: server/start:1.19

1: - string cvs_version = "$Id: configuration.pike,v 1.53 1997/08/13 19:22:20 grubba Exp $"; + string cvs_version = "$Id: configuration.pike,v 1.54 1997/08/13 21:37:30 per Exp $";   #include <module.h>   #include <roxen.h>   /* A configuration.. */
2362:          -  +    // This is the most likely URL for a virtual server. Again, this   // should move into the actual 'configuration' object. It is not all   // that nice to have all this code lying around in here.
2375:    return "http://" + s + "/";   }    - void create(string config) + void enable_all_modules()   { -  array modules_to_process; +  array modules_to_process = sort_array(indices(retrieve("EnabledModules",this)));    string tmp_string;    -  +  +  // Always enable the user database module first. +  if(search(modules_to_process, "userdb#0")>-1) +  modules_to_process = (({"userdb#0"})+(modules_to_process-({"userdb#0"}))); +  +  +  array err; +  foreach( modules_to_process, tmp_string ) +  if(err = catch( enable_module( tmp_string ) )) +  report_error("Failed to enable the module "+tmp_string+". Skipping\n" + #ifdef MODULE_DEBUG +  +describe_backtrace(err)+"\n" + #endif +  ); +  roxen->current_configuration = 0; + } +  + void create(string config) + {    roxen->current_configuration = this;    name=config;   
2524:    }       set("_v", CONFIGURATION_FILE_LEVEL); -  -  modules_to_process = sort_array(indices(retrieve("EnabledModules",this))); -  -  // Always enable the user database module first. -  if(search(modules_to_process, "userdb#0")>-1) -  modules_to_process = (({"userdb#0"})+(modules_to_process-({"userdb#0"}))); -  -  -  array err; -  foreach( modules_to_process, tmp_string ) -  if(err = catch( enable_module( tmp_string ) )) -  report_error("Failed to enable the module "+tmp_string+". Skipping\n" - #ifdef MODULE_DEBUG -  +describe_backtrace(err)+"\n" - #endif -  ); -  roxen->current_configuration = 0; +  enable_all_modules();   }