diff src/auth/auth-settings.c @ 15088:14df6be0111f

Read SSL settings only if service has SSL sockets or MASTER_SERVICE_FLAG_USE_SSL_SETTINGS.
author Timo Sirainen <tss@iki.fi>
date Wed, 19 Sep 2012 15:34:00 +0300
parents 9ad9a79c1747
children d60aa734c72d
line wrap: on
line diff
--- a/src/auth/auth-settings.c	Wed Sep 19 15:33:10 2012 +0300
+++ b/src/auth/auth-settings.c	Wed Sep 19 15:34:00 2012 +0300
@@ -392,8 +392,8 @@
 	};
  	struct master_service_settings_input input;
 	struct setting_parser_context *set_parser;
-	struct auth_settings *set;
 	const char *error;
+	void **sets;
 
 	memset(&input, 0, sizeof(input));
 	input.roots = set_roots;
@@ -408,7 +408,8 @@
 	if (!settings_parser_check(set_parser, pool, &error))
 		i_unreached();
 
-	set = settings_parser_get_list(set_parser)[MASTER_SERVICE_INTERNAL_SET_PARSERS];
+	sets = master_service_settings_parser_get_others(master_service,
+							 set_parser);
 	settings_parser_deinit(&set_parser);
-	return set;
+	return sets[0];
 }