lmtp-proxy.c (dovecot-2.3.16) | : | lmtp-proxy.c (dovecot-2.3.17) | ||
---|---|---|---|---|
skipping to change at line 192 | skipping to change at line 192 | |||
conn->lmtp_trans = NULL; | conn->lmtp_trans = NULL; | |||
} | } | |||
static void | static void | |||
lmtp_proxy_connection_init_ssl(struct lmtp_proxy_connection *conn, | lmtp_proxy_connection_init_ssl(struct lmtp_proxy_connection *conn, | |||
struct ssl_iostream_settings *ssl_set_r, | struct ssl_iostream_settings *ssl_set_r, | |||
enum smtp_client_connection_ssl_mode *ssl_mode_r) | enum smtp_client_connection_ssl_mode *ssl_mode_r) | |||
{ | { | |||
const struct master_service_ssl_settings *master_ssl_set; | const struct master_service_ssl_settings *master_ssl_set; | |||
i_zero(ssl_set_r); | ||||
*ssl_mode_r = SMTP_CLIENT_SSL_MODE_NONE; | *ssl_mode_r = SMTP_CLIENT_SSL_MODE_NONE; | |||
if ((conn->set.ssl_flags & PROXY_SSL_FLAG_YES) == 0) | if ((conn->set.ssl_flags & PROXY_SSL_FLAG_YES) == 0) { | |||
i_zero(ssl_set_r); | ||||
return; | return; | |||
} | ||||
master_ssl_set = master_service_ssl_settings_get(master_service); | master_ssl_set = master_service_ssl_settings_get(master_service); | |||
master_service_ssl_settings_to_iostream_set( | master_service_ssl_client_settings_to_iostream_set( | |||
master_ssl_set, pool_datastack_create(), | master_ssl_set, pool_datastack_create(), ssl_set_r); | |||
MASTER_SERVICE_SSL_SETTINGS_TYPE_CLIENT, ssl_set_r); | ||||
if ((conn->set.ssl_flags & PROXY_SSL_FLAG_ANY_CERT) != 0) | if ((conn->set.ssl_flags & PROXY_SSL_FLAG_ANY_CERT) != 0) | |||
ssl_set_r->allow_invalid_cert = TRUE; | ssl_set_r->allow_invalid_cert = TRUE; | |||
if ((conn->set.ssl_flags & PROXY_SSL_FLAG_STARTTLS) == 0) | if ((conn->set.ssl_flags & PROXY_SSL_FLAG_STARTTLS) == 0) | |||
*ssl_mode_r = SMTP_CLIENT_SSL_MODE_IMMEDIATE; | *ssl_mode_r = SMTP_CLIENT_SSL_MODE_IMMEDIATE; | |||
else | else | |||
*ssl_mode_r = SMTP_CLIENT_SSL_MODE_STARTTLS; | *ssl_mode_r = SMTP_CLIENT_SSL_MODE_STARTTLS; | |||
} | } | |||
static bool | static bool | |||
End of changes. 4 change blocks. | ||||
5 lines changed or deleted | 5 lines changed or added |