summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--imap/ChangeLog5
-rw-r--r--imap/pop3d-ssl.dist.in.git9
2 files changed, 5 insertions, 9 deletions
diff --git a/imap/ChangeLog b/imap/ChangeLog
index 1693409..d533530 100644
--- a/imap/ChangeLog
+++ b/imap/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-28 Sam Varshavchik <mrsam@courier-mta.com>
+
+ * pop3d-ssl.dist.in (TLS_STARTTLS_PROTOCOL): Remove duplicate entry
+ in the pop3d-ssl configuration file.
+
5.1.2
2021-03-25 Sam Varshavchik <mrsam@courier-mta.com>
diff --git a/imap/pop3d-ssl.dist.in.git b/imap/pop3d-ssl.dist.in.git
index d2695d0..a9b6543 100644
--- a/imap/pop3d-ssl.dist.in.git
+++ b/imap/pop3d-ssl.dist.in.git
@@ -150,15 +150,6 @@ TLS_STARTTLS_PROTOCOL="$TLS_PROTOCOL"
#
# See the OpenSSL ciphers(1) manual page for the format of this setting.
-##NAME: TLS_STARTTLS_PROTOCOL:0
-#
-# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the IMAP STARTTLS
-# extension, as opposed to IMAP over SSL on port 993.
-#
-# It takes the same values for OpenSSL as TLS_PROTOCOL
-
-TLS_STARTTLS_PROTOCOL="$TLS_PROTOCOL"
-
##NAME: TLS_MIN_DH_BITS:0
#
# TLS_MIN_DH_BITS=n