Mercurial > dovecot > original-hg > dovecot-1.2

changeset 9560:a6d0fa17ddee HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imap/pop3-login: ssl=yes shouldn't change port if port was already specified.
author Timo Sirainen <tss@iki.fi>
date Wed, 14 Apr 2010 19:17:08 +0300
parents 9d472f43bcdb
children e4c096fae5ac
files src/imap-login/client-authenticate.c src/pop3-login/client-authenticate.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap-login/client-authenticate.c	Wed Apr 14 19:14:24 2010 +0300
+++ b/src/imap-login/client-authenticate.c	Wed Apr 14 19:17:08 2010 +0300
@@ -169,7 +169,8 @@
 		else if (strcmp(key, "ssl") == 0) {
 			if (strcmp(value, "yes") == 0) {
 				ssl_flags |= PROXY_SSL_FLAG_YES;
-				port = 993;
+				if (port == 0)
+					port = 993;
 			} else if (strcmp(value, "any-cert") == 0) {
 				ssl_flags |= PROXY_SSL_FLAG_YES |
 					PROXY_SSL_FLAG_ANY_CERT;
--- a/src/pop3-login/client-authenticate.c	Wed Apr 14 19:14:24 2010 +0300
+++ b/src/pop3-login/client-authenticate.c	Wed Apr 14 19:17:08 2010 +0300
@@ -168,7 +168,8 @@
 		else if (strcmp(key, "ssl") == 0) {
 			if (strcmp(value, "yes") == 0) {
 				ssl_flags |= PROXY_SSL_FLAG_YES;
-				port = 995;
+				if (port == 0)
+					port = 995;
 			} else if (strcmp(value, "any-cert") == 0) {
 				ssl_flags |= PROXY_SSL_FLAG_YES |
 					PROXY_SSL_FLAG_ANY_CERT;