dovecot-2.0: config: Fixed obsolete listen setting check to hand...

dovecot at dovecot.org dovecot at dovecot.org
Tue Mar 9 19:40:35 EET 2010


details:   http://hg.dovecot.org/dovecot-2.0/rev/a38d597c5b59
changeset: 10884:a38d597c5b59
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Mar 09 19:40:33 2010 +0200
description:
config: Fixed obsolete listen setting check to handle multiple addresses.
Currently it doesn't handle obsolete settings having multiple addresses.

diffstat:

 src/config/old-set-parser.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r bed9f7593c0e -r a38d597c5b59 src/config/old-set-parser.c
--- a/src/config/old-set-parser.c	Tue Mar 09 19:36:09 2010 +0200
+++ b/src/config/old-set-parser.c	Tue Mar 09 19:40:33 2010 +0200
@@ -197,12 +197,17 @@
 
 static bool listen_has_port(const char *str)
 {
-	const char *p;
+	const char *p, *const *addrs;
 
 	if ((p = strchr(str, ':')) == NULL)
 		return FALSE;
 
-	return !is_ipv6_address(str);
+	addrs = t_strsplit_spaces(str, ", ");
+	for (; *addrs != NULL; addrs++) {
+		if (!is_ipv6_address(str))
+			return TRUE;
+	}
+	return FALSE;
 }
 
 static bool


More information about the dovecot-cvs mailing list