[dovecot-cvs] dovecot/src/master main.c,1.80.2.8,1.80.2.9

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv7764

Modified Files:
      Tag: branch_1_0
	main.c 
Log Message:
dovecot -n and -a: Print the config file path before parsing it so if there
are errors you can see what file is being used.



Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/main.c,v
retrieving revision 1.80.2.8
retrieving revision 1.80.2.9
diff -u -d -r1.80.2.8 -r1.80.2.9
--- main.c	2 Jul 2006 13:55:30 -0000	1.80.2.8
+++ main.c	5 Jul 2006 19:52:21 -0000	1.80.2.9
@@ -777,6 +777,12 @@
 		foreground = TRUE;
 	}
 
+	if (dump_config || dump_config_nondefaults) {
+		/* print the config file path before parsing it, so in case
+		   of errors it's still shown */
+		printf("# %s\n", configfile);
+	}
+
 	/* read and verify settings before forking */
 	t_push();
 	master_settings_init();
@@ -785,7 +791,6 @@
 	t_pop();
 
 	if (dump_config || dump_config_nondefaults) {
-		printf("# %s\n", configfile);
 		master_settings_dump(settings_root, dump_config_nondefaults);
 		return 0;
 	}