comparison src/mail/ngx_mail_smtp_handler.c @ 2862:62c95a6b143b stable-0.6

r2496, r2749 merge: compatibility with Microsoft's AUTH LOGIN [base64 encoded user name ] patch by Maxim Dounin
author Igor Sysoev <igor@sysoev.ru>
date Mon, 18 May 2009 15:58:46 +0000
parents f4aea5b40fd7
children
comparison
equal deleted inserted replaced
2861:771ca4480b4d 2862:62c95a6b143b
450 } 450 }
451 451
452 break; 452 break;
453 453
454 case ngx_smtp_auth_login_username: 454 case ngx_smtp_auth_login_username:
455 rc = ngx_mail_auth_login_username(s, c); 455 rc = ngx_mail_auth_login_username(s, c, 0);
456 456
457 s->out.len = sizeof(smtp_password) - 1; 457 s->out.len = sizeof(smtp_password) - 1;
458 s->out.data = smtp_password; 458 s->out.data = smtp_password;
459 s->mail_state = ngx_smtp_auth_login_password; 459 s->mail_state = ngx_smtp_auth_login_password;
460 break; 460 break;
594 s->out.data = smtp_username; 594 s->out.data = smtp_username;
595 s->mail_state = ngx_smtp_auth_login_username; 595 s->mail_state = ngx_smtp_auth_login_username;
596 596
597 return NGX_OK; 597 return NGX_OK;
598 598
599 case NGX_MAIL_AUTH_LOGIN_USERNAME:
600
601 s->out.len = sizeof(smtp_password) - 1;
602 s->out.data = smtp_password;
603 s->mail_state = ngx_smtp_auth_login_password;
604
605 return ngx_mail_auth_login_username(s, c, 1);
606
599 case NGX_MAIL_AUTH_PLAIN: 607 case NGX_MAIL_AUTH_PLAIN:
600 608
601 s->out.len = sizeof(smtp_next) - 1; 609 s->out.len = sizeof(smtp_next) - 1;
602 s->out.data = smtp_next; 610 s->out.data = smtp_next;
603 s->mail_state = ngx_smtp_auth_plain; 611 s->mail_state = ngx_smtp_auth_plain;