diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-11-13 14:20:54 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-11-13 14:20:54 +0000 |
| commit | 2ab644895e691c5937e17f99e9a53ca5acc410fa (patch) | |
| tree | 382dc483cfe656dff86acc8b2dc18b8ccbc0ebfd | |
| parent | d67d8478a675ca812810826eff4708616a33008f (diff) | |
| download | nginx-2ab644895e691c5937e17f99e9a53ca5acc410fa.tar.gz | |
do not close session if SMTP backend returned an error on RCPT TO
patch by Maxim Dounin
| -rw-r--r-- | src/mail/ngx_mail_proxy_module.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/mail/ngx_mail_proxy_module.c b/src/mail/ngx_mail_proxy_module.c index c92cbba55..8890002d1 100644 --- a/src/mail/ngx_mail_proxy_module.c +++ b/src/mail/ngx_mail_proxy_module.c @@ -104,7 +104,6 @@ ngx_module_t ngx_mail_proxy_module = { }; -static u_char smtp_auth_ok[] = "235 2.0.0 OK" CRLF; static u_char smtp_ok[] = "250 2.0.0 OK" CRLF; @@ -612,16 +611,13 @@ ngx_mail_proxy_smtp_handler(ngx_event_t *rev) b = s->proxy->buffer; if (s->auth_method == NGX_MAIL_AUTH_NONE) { - ngx_memcpy(b->start, smtp_ok, sizeof(smtp_ok) - 1); - b->last = b->start + sizeof(smtp_ok) - 1; + b->pos = b->start; } else { - ngx_memcpy(b->start, smtp_auth_ok, sizeof(smtp_auth_ok) - 1); - b->last = b->start + sizeof(smtp_auth_ok) - 1; + ngx_memcpy(b->start, smtp_ok, sizeof(smtp_ok) - 1); + b->last = b->start + sizeof(smtp_ok) - 1; } - b->pos = b->start; - s->connection->read->handler = ngx_mail_proxy_handler; s->connection->write->handler = ngx_mail_proxy_handler; rev->handler = ngx_mail_proxy_handler; @@ -759,18 +755,17 @@ ngx_mail_proxy_read_response(ngx_mail_session_t *s, ngx_uint_t state) default: /* NGX_MAIL_SMTP_PROTOCOL */ switch (state) { - case ngx_smtp_helo: - case ngx_smtp_helo_from: - case ngx_smtp_helo_xclient: - case ngx_smtp_from: - case ngx_smtp_to: - if (p[0] == '2' && p[1] == '5' && p[2] == '0') { + case ngx_smtp_start: + if (p[0] == '2' && p[1] == '2' && p[2] == '0') { return NGX_OK; } break; - case ngx_smtp_start: - if (p[0] == '2' && p[1] == '2' && p[2] == '0') { + case ngx_smtp_helo: + case ngx_smtp_helo_xclient: + case ngx_smtp_helo_from: + case ngx_smtp_from: + if (p[0] == '2' && p[1] == '5' && p[2] == '0') { return NGX_OK; } break; @@ -781,6 +776,9 @@ ngx_mail_proxy_read_response(ngx_mail_session_t *s, ngx_uint_t state) return NGX_OK; } break; + + case ngx_smtp_to: + return NGX_OK; } break; |