dovecot-2.0: login proxy: "ssl" and "starttls" handlers make mor...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/d693c4a97d41
changeset: 11229:d693c4a97d41
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Apr 29 21:29:01 2010 +0300
description:
login proxy: "ssl" and "starttls" handlers make more sense now.

 - "starttls" no longer requires "ssl", and "starttls=anycert" is now possible.
 - "ssl=any-cert" updates the default port.
 - "ssl=anything" now also enables ssl instead of being ignored.

diffstat:

 src/login-common/client-common-auth.c |  20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diffs (31 lines):

diff -r 888ac9037642 -r d693c4a97d41 src/login-common/client-common-auth.c
--- a/src/login-common/client-common-auth.c	Thu Apr 29 21:08:41 2010 +0300
+++ b/src/login-common/client-common-auth.c	Thu Apr 29 21:29:01 2010 +0300
@@ -90,18 +90,16 @@
 		else if (strcmp(key, "master") == 0)
 			reply_r->master_user = value;
 		else if (strcmp(key, "ssl") == 0) {
-			if (strcmp(value, "yes") == 0) {
-				reply_r->ssl_flags |= PROXY_SSL_FLAG_YES;
-				if (reply_r->port == 0) {
-					reply_r->port =
-						login_binary.default_ssl_port;
-				}
-			} else if (strcmp(value, "any-cert") == 0) {
-				reply_r->ssl_flags |= PROXY_SSL_FLAG_YES |
-					PROXY_SSL_FLAG_ANY_CERT;
-			}
+			reply_r->ssl_flags |= PROXY_SSL_FLAG_YES;
+			if (strcmp(value, "any-cert") == 0)
+				reply_r->ssl_flags |= PROXY_SSL_FLAG_ANY_CERT;
+			if (reply_r->port == 0)
+				reply_r->port = login_binary.default_ssl_port;
 		} else if (strcmp(key, "starttls") == 0) {
-			reply_r->ssl_flags |= PROXY_SSL_FLAG_STARTTLS;
+			reply_r->ssl_flags |= PROXY_SSL_FLAG_YES |
+				PROXY_SSL_FLAG_STARTTLS;
+			if (strcmp(value, "any-cert") == 0)
+				reply_r->ssl_flags |= PROXY_SSL_FLAG_ANY_CERT;
 		} else if (strcmp(key, "user") == 0) {
 			/* already handled in login-common */
 		} else if (client->set->auth_debug)