diff options
Diffstat (limited to 'src/mail/ngx_mail_smtp_handler.c')
| -rw-r--r-- | src/mail/ngx_mail_smtp_handler.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mail/ngx_mail_smtp_handler.c b/src/mail/ngx_mail_smtp_handler.c index 8eb28df2f..9fad45958 100644 --- a/src/mail/ngx_mail_smtp_handler.c +++ b/src/mail/ngx_mail_smtp_handler.c @@ -46,13 +46,6 @@ ngx_mail_smtp_init_session(ngx_mail_session_t *s, ngx_connection_t *c) cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module); - if (cscf->smtp_auth_methods & NGX_MAIL_AUTH_CRAM_MD5_ENABLED) { - if (ngx_mail_salt(s, c, cscf) != NGX_OK) { - ngx_mail_session_internal_server_error(s); - return; - } - } - timeout = cscf->smtp_greeting_delay ? cscf->smtp_greeting_delay: cscf->timeout; ngx_add_timer(c->read, timeout); @@ -422,6 +415,12 @@ ngx_mail_smtp_auth(ngx_mail_session_t *s, ngx_connection_t *c) return NGX_MAIL_PARSE_INVALID_COMMAND; } + if (s->salt.data == NULL) { + if (ngx_mail_salt(s, c, cscf) != NGX_OK) { + return NGX_ERROR; + } + } + if (ngx_mail_auth_cram_md5_salt(s, c, "334 ", 4) == NGX_OK) { s->mail_state = ngx_smtp_auth_cram_md5; return NGX_OK; |