** as folder separators for displaying IMAP paths. In particular it
** helps in using the '\fT=\fP' shortcut for your $$folder variable.
*/
-# if defined(USE_SSL) || defined(USE_GNUTLS)
- {"imap_force_ssl", DT_BOOL, R_NONE, OPTIMAPFORCESSL, 0},
- /*
- ** .pp
- ** Availability: IMAP and SSL or IMAP and GNUTLS
- **
- ** .pp
- ** If this variable is \fIset\fP, Mutt-ng will always use SSL when
- ** connecting to IMAP servers.
- */
-# endif
{"imap_headers", DT_STR, R_INDEX, UL &ImapHeaders, UL 0},
/*
** .pp
** The file containing a client certificate and its associated private
** key.
*/
-#endif
-# if defined(USE_SSL)||defined(USE_GNUTLS)
+#endif /* USE_SSL */
+ {"ssl_force_tls", DT_BOOL, R_NONE, OPTSSLFORCETLS, 0 },
+ /*
+ ** .pp
+ ** If this variable is \fIset\fP, mutt-ng will require that all connections
+ ** to remote servers be encrypted. Furthermore it will attempt to
+ ** negotiate TLS even if the server does not advertise the capability,
+ ** since it would otherwise have to abort the connection anyway. This
+ ** option supersedes ``$$ssl_starttls''.
+ */
{"ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES},
/*
** .pp
** advertising the capability. When \fIunset\fP, Mutt-ng will not attempt to
** use STARTTLS regardless of the server's capabilities.
*/
-# endif
{"certificate_file", DT_PATH, R_NONE, UL &SslCertFile, UL "~/.mutt_certificates"},
/*
** .pp
** This variables specifies whether to attempt to use SSLv2 in the
** SSL authentication process.
*/
-# endif
+# endif /* _MAKEDOC || !USE_GNUTLS */
{"ssl_use_sslv3", DT_BOOL, R_NONE, OPTSSLV3, 1},
/*
** .pp
** This variables specifies whether to attempt to use TLSv1 in the
** SSL authentication process.
*/
-#ifdef USE_GNUTLS
+# ifdef USE_GNUTLS
{"ssl_min_dh_prime_bits", DT_NUM, R_NONE, UL &SslDHPrimeBits, 0},
/*
** .pp
** .pp
** Example: \fTset ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt\fP
*/
-#endif
-#endif
+# endif /* USE_GNUTLS */
+# endif /* USE_SSL || USE_GNUTLS */
{"pipe_split", DT_BOOL, R_NONE, OPTPIPESPLIT, 0},
/*
** .pp