Mercurial > dovecot > original-hg > dovecot-1.2
diff src/master/main.c @ 4965:9246d9308caa HEAD
-n and -a parameters shouldn't be deleting auth sockets.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Thu, 28 Dec 2006 17:06:31 +0200 |
| parents | 204d7edc7cdc |
| children | 4654603f24f6 |
line wrap: on
line diff
--- a/src/master/main.c Thu Dec 28 16:47:38 2006 +0200 +++ b/src/master/main.c Thu Dec 28 17:06:31 2006 +0200 @@ -139,7 +139,7 @@ auth_processes_destroy_all(); dict_process_kill(); - if (!master_settings_read(configfile, FALSE)) + if (!master_settings_read(configfile, FALSE, FALSE)) i_warning("Invalid configuration, keeping old one"); else { if (!IS_INETD()) { @@ -752,7 +752,7 @@ if (i == argc) i_fatal("Missing config file argument"); configfile = argv[i]; } else if (strcmp(argv[i], "-n") == 0) { - dump_config_nondefaults = TRUE; + dump_config_nondefaults = dump_config = TRUE; } else if (strcmp(argv[i], "-p") == 0) { /* Ask SSL private key password */ ask_key_pass = TRUE; @@ -785,7 +785,7 @@ foreground = TRUE; } - if (dump_config || dump_config_nondefaults) { + if (dump_config) { /* print the config file path before parsing it, so in case of errors it's still shown */ printf("# %s\n", configfile); @@ -794,11 +794,12 @@ /* read and verify settings before forking */ t_push(); master_settings_init(); - if (!master_settings_read(configfile, exec_protocol != NULL)) + if (!master_settings_read(configfile, exec_protocol != NULL, + dump_config)) exit(FATAL_DEFAULT); t_pop(); - if (dump_config || dump_config_nondefaults) { + if (dump_config) { master_settings_dump(settings_root, dump_config_nondefaults); return 0; }