--- a/src/mail/ngx_mail_handler.c
+++ b/src/mail/ngx_mail_handler.c
@@ -1727,7 +1727,7 @@ ngx_smtp_auth_state(ngx_event_t *rev)
 
                 if (s->connection->log->log_level >= NGX_LOG_INFO
                     || (cscf->smtp_auth_methods
-                        & NGX_MAIL_AUTH_UNAUTH_ENABLED))
+                        & NGX_MAIL_AUTH_NONE_ENABLED))
                 {
                     l.len = s->buffer->last - s->buffer->start;
                     l.data = s->buffer->start;
@@ -1753,7 +1753,7 @@ ngx_smtp_auth_state(ngx_event_t *rev)
                     l.len = i;
 
                     if (!(cscf->smtp_auth_methods
-                          & NGX_MAIL_AUTH_UNAUTH_ENABLED))
+                          & NGX_MAIL_AUTH_NONE_ENABLED))
                     {
                         ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
                                       "client was rejected: \"%V\"", &l);
@@ -1761,14 +1761,14 @@ ngx_smtp_auth_state(ngx_event_t *rev)
 
                 }
 
-                if (!(cscf->smtp_auth_methods & NGX_MAIL_AUTH_UNAUTH_ENABLED))
+                if (!(cscf->smtp_auth_methods & NGX_MAIL_AUTH_NONE_ENABLED))
                 {
                     text = smtp_auth_required;
                     size = sizeof(smtp_auth_required) - 1;
                     break;
                 }
 
-                /* allow unauth */
+                /* auth none */
 
                 if (s->smtp_from.len) {
                     text = smtp_bad_sequence;
@@ -1831,7 +1831,7 @@ ngx_smtp_auth_state(ngx_event_t *rev)
 
                 ngx_memcpy(s->smtp_to.data, l.data, l.len);
 
-                s->auth_method = NGX_MAIL_AUTH_UNAUTH;
+                s->auth_method = NGX_MAIL_AUTH_NONE;
 
                 ngx_mail_do_auth(s);
                 return;