Mercurial > dovecot > original-hg > dovecot-1.2

changeset 861:7498eab8903f HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show STARTTLS in capability only if SSL support is enabled.
author Timo Sirainen <tss@iki.fi>
date Fri, 27 Dec 2002 22:33:46 +0200
parents c3d0eddd6065
children 375923d2f910
files configure.in src/login/client.c
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Fri Dec 27 18:03:01 2002 +0200
+++ b/configure.in	Fri Dec 27 22:33:46 2002 +0200
@@ -760,9 +760,6 @@
 dnl **
 
 capability="IMAP4rev1 SORT"
-if test "$have_ssl" != "no"; then
-	capability="$capability STARTTLS"
-fi
 AC_DEFINE_UNQUOTED(CAPABILITY_STRING, "$capability", IMAP capabilities)
 
 dnl **
--- a/src/login/client.c	Fri Dec 27 18:03:01 2002 +0200
+++ b/src/login/client.c	Fri Dec 27 22:33:46 2002 +0200
@@ -45,6 +45,7 @@
 	const char *capability;
 
 	capability = t_strconcat("* CAPABILITY " CAPABILITY_STRING,
+				 ssl_initialized ? " STARTTLS" : "",
 				 disable_plaintext_auth && !client->tls ?
 				 " LOGINDISABLED" : "",
 				 client_authenticate_get_capabilities(),