mirror of
https://github.com/nginx/nginx.git
synced 2025-06-10 19:42:39 +08:00
Merge 0d03226434
into 5b8a5c08ce
This commit is contained in:
commit
4d398c092f
@ -742,6 +742,12 @@ ngx_mail_smtp_mail(ngx_mail_session_t *s, ngx_connection_t *c)
|
|||||||
ngx_str_t *arg, cmd;
|
ngx_str_t *arg, cmd;
|
||||||
ngx_mail_smtp_srv_conf_t *sscf;
|
ngx_mail_smtp_srv_conf_t *sscf;
|
||||||
|
|
||||||
|
#if (NGX_MAIL_SSL)
|
||||||
|
if (ngx_mail_starttls_only(s, c)) {
|
||||||
|
return NGX_MAIL_PARSE_INVALID_COMMAND;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module);
|
sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module);
|
||||||
|
|
||||||
if (!(sscf->auth_methods & NGX_MAIL_AUTH_NONE_ENABLED)) {
|
if (!(sscf->auth_methods & NGX_MAIL_AUTH_NONE_ENABLED)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user