[dovecot-cvs] dovecot/src/master master-settings.c, 1.125.2.25, 1.125.2.26

[tss at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	master-settings.c 
Log Message:
dovecot -n/-a dumps now also dict/plugin settings.



Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.125.2.25
retrieving revision 1.125.2.26
diff -u -d -r1.125.2.25 -r1.125.2.26
--- master-settings.c	2 Feb 2007 11:20:21 -0000	1.125.2.25
+++ master-settings.c	20 Feb 2007 10:25:10 -0000	1.125.2.26
@@ -1482,6 +1482,38 @@
 	}
 }
 
+static void plugin_settings_dump(const struct settings *set)
+{
+	const char *const *envs;
+	unsigned int i, count;
+
+	envs = array_get(&set->plugin_envs, &count);
+	i_assert((count % 2) == 0);
+
+	if (count == 0)
+		return;
+
+	printf("plugin:\n");
+	for (i = 0; i < count; i += 2)
+		printf("  %s: %s\n", envs[i], envs[i+1]);
+}
+
+static void dict_settings_dump(const struct server_settings *set)
+{
+	const char *const *dicts;
+	unsigned int i, count;
+
+	dicts = array_get(&set->dicts, &count);
+	i_assert((count % 2) == 0);
+
+	if (count == 0)
+		return;
+
+	printf("dict:\n");
+	for (i = 0; i < count; i += 2)
+		printf("  %s: %s\n", dicts[i], dicts[i+1]);
+}
+
 void master_settings_dump(struct server_settings *set, bool nondefaults)
 {
 	const void *sets[4];
@@ -1508,6 +1540,8 @@
 	settings_dump(setting_defs, sets, set_names, count, nondefaults, 0);
 	namespace_settings_dump(set->namespaces, nondefaults);
 	auth_settings_dump(set->auths, nondefaults);
+	plugin_settings_dump(set->defaults);
+	dict_settings_dump(set);
 }
 
 void master_settings_init(void)