diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-03-17 23:01:29 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-03-18 10:30:16 +0200 |
commit | ca22428399f3b4eeef51b289e91d31a3cdec0b72 (patch) | |
tree | 90ceb21f9bc4e78421baf9f59e880fbecb7ee170 /src/main.c | |
parent | 9ccabb0f25ef0d7503bd01cdf0bbd83f7302703e (diff) | |
download | mailfromd-ca22428399f3b4eeef51b289e91d31a3cdec0b72.tar.gz mailfromd-ca22428399f3b4eeef51b289e91d31a3cdec0b72.tar.bz2 |
Rethink the solution to mtasim interaction problem (see c0535e8e).
* src/main.c (parse_opt) <OPTION_MTASIM>: Rollback c0535e8e.
(mtasim_option): Move to srvcfg.c.
* src/srvcfg.c (server_section_parser) <mu_cfg_section_end>: If
mtasim_option is set, ignore the server statements.
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -71,7 +71,6 @@ char *ext_pp_options; int ext_pp_options_given; int do_trace; /* Enable tracing configuration */ -int mtasim_option; /* mtasim compatibility mode */ unsigned optimization_level = 1; /* Optimization level */ int stack_trace_option; /* Print stack traces on runtime errors */ @@ -625,8 +624,6 @@ parse_opt(int key, char *arg, struct argp_state *state) case OPTION_MTASIM: mtasim_option = 1; server_flags |= MF_SERVER_FOREGROUND; - mu_load_site_rcfile = 0; - mu_load_user_rcfile = 0; break; case OPTION_SHOW_DEFAULTS: |