|
|
@ -2902,7 +2902,7 @@ imap_parse_store( conffile_t *cfg, store_conf_t **storep ) |
|
|
|
#ifdef HAVE_LIBSSL |
|
|
|
#ifdef HAVE_LIBSSL |
|
|
|
if ((use_sslv2 & use_sslv3 & use_tlsv1 & use_tlsv11 & use_tlsv12) != -1 || use_imaps >= 0 || require_ssl >= 0) { |
|
|
|
if ((use_sslv2 & use_sslv3 & use_tlsv1 & use_tlsv11 & use_tlsv12) != -1 || use_imaps >= 0 || require_ssl >= 0) { |
|
|
|
if (server->ssl_type >= 0 || server->sconf.ssl_versions >= 0) { |
|
|
|
if (server->ssl_type >= 0 || server->sconf.ssl_versions >= 0) { |
|
|
|
error( "%s '%s': The deprecated UseSSL*, UseTLS*, UseIMAPS, and RequireSSL options are mutually exlusive with SSLType and SSLVersions.\n", type, name ); |
|
|
|
error( "%s '%s': The deprecated UseSSL*, UseTLS*, UseIMAPS, and RequireSSL options are mutually exclusive with SSLType and SSLVersions.\n", type, name ); |
|
|
|
cfg->err = 1; |
|
|
|
cfg->err = 1; |
|
|
|
return 1; |
|
|
|
return 1; |
|
|
|
} |
|
|
|
} |
|
|
@ -2937,7 +2937,7 @@ imap_parse_store( conffile_t *cfg, store_conf_t **storep ) |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
if (require_cram >= 0) { |
|
|
|
if (require_cram >= 0) { |
|
|
|
if (server->auth_mechs) { |
|
|
|
if (server->auth_mechs) { |
|
|
|
error( "%s '%s': The deprecated RequireCRAM option is mutually exlusive with AuthMech.\n", type, name ); |
|
|
|
error( "%s '%s': The deprecated RequireCRAM option is mutually exclusive with AuthMech.\n", type, name ); |
|
|
|
cfg->err = 1; |
|
|
|
cfg->err = 1; |
|
|
|
return 1; |
|
|
|
return 1; |
|
|
|
} |
|
|
|
} |
|
|
|