dovecot-1.2: imap/pop3-login: ssl=yes shouldn't change port if p...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/a6d0fa17ddee
changeset: 9560:a6d0fa17ddee
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Apr 14 19:17:08 2010 +0300
description:
imap/pop3-login: ssl=yes shouldn't change port if port was already specified.

diffstat:

 src/imap-login/client-authenticate.c |  3 ++-
 src/pop3-login/client-authenticate.c |  3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 9d472f43bcdb -r a6d0fa17ddee src/imap-login/client-authenticate.c
--- 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;
diff -r 9d472f43bcdb -r a6d0fa17ddee src/pop3-login/client-authenticate.c
--- 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;