diff options
Diffstat (limited to 'src/imap')
| -rw-r--r-- | src/imap/ngx_imap_auth_http_module.c | 36 | ||||
| -rw-r--r-- | src/imap/ngx_imap_handler.c | 13 |
2 files changed, 34 insertions, 15 deletions
diff --git a/src/imap/ngx_imap_auth_http_module.c b/src/imap/ngx_imap_auth_http_module.c index 668a952fa..f3e11e86b 100644 --- a/src/imap/ngx_imap_auth_http_module.c +++ b/src/imap/ngx_imap_auth_http_module.c @@ -477,8 +477,10 @@ ngx_imap_auth_http_process_headers(ngx_imap_session_t *s, len = ctx->header_name_end - ctx->header_name_start; if (len == sizeof("Auth-Status") - 1 - && ngx_strncasecmp(ctx->header_name_start, "Auth-Status", - sizeof("Auth-Status") - 1) == 0) + && ngx_strncasecmp(ctx->header_name_start, + (u_char *) "Auth-Status", + sizeof("Auth-Status") - 1) + == 0) { len = ctx->header_end - ctx->header_start; @@ -539,8 +541,10 @@ ngx_imap_auth_http_process_headers(ngx_imap_session_t *s, } if (len == sizeof("Auth-Server") - 1 - && ngx_strncasecmp(ctx->header_name_start, "Auth-Server", - sizeof("Auth-Server") - 1) == 0) + && ngx_strncasecmp(ctx->header_name_start, + (u_char *) "Auth-Server", + sizeof("Auth-Server") - 1) + == 0) { ctx->addr.len = ctx->header_end - ctx->header_start; ctx->addr.data = ctx->header_start; @@ -549,8 +553,10 @@ ngx_imap_auth_http_process_headers(ngx_imap_session_t *s, } if (len == sizeof("Auth-Port") - 1 - && ngx_strncasecmp(ctx->header_name_start, "Auth-Port", - sizeof("Auth-Port") - 1) == 0) + && ngx_strncasecmp(ctx->header_name_start, + (u_char *) "Auth-Port", + sizeof("Auth-Port") - 1) + == 0) { ctx->port.len = ctx->header_end - ctx->header_start; ctx->port.data = ctx->header_start; @@ -559,8 +565,10 @@ ngx_imap_auth_http_process_headers(ngx_imap_session_t *s, } if (len == sizeof("Auth-User") - 1 - && ngx_strncasecmp(ctx->header_name_start, "Auth-User", - sizeof("Auth-User") - 1) == 0) + && ngx_strncasecmp(ctx->header_name_start, + (u_char *) "Auth-User", + sizeof("Auth-User") - 1) + == 0) { s->login.len = ctx->header_end - ctx->header_start; @@ -578,8 +586,10 @@ ngx_imap_auth_http_process_headers(ngx_imap_session_t *s, } if (len == sizeof("Auth-Pass") - 1 - && ngx_strncasecmp(ctx->header_name_start, "Auth-Pass", - sizeof("Auth-Pass") - 1) == 0) + && ngx_strncasecmp(ctx->header_name_start, + (u_char *) "Auth-Pass", + sizeof("Auth-Pass") - 1) + == 0) { s->passwd.len = ctx->header_end - ctx->header_start; @@ -597,8 +607,10 @@ ngx_imap_auth_http_process_headers(ngx_imap_session_t *s, } if (len == sizeof("Auth-Wait") - 1 - && ngx_strncasecmp(ctx->header_name_start, "Auth-Wait", - sizeof("Auth-Wait") - 1) == 0) + && ngx_strncasecmp(ctx->header_name_start, + (u_char *) "Auth-Wait", + sizeof("Auth-Wait") - 1) + == 0) { n = ngx_atoi(ctx->header_start, ctx->header_end - ctx->header_start); diff --git a/src/imap/ngx_imap_handler.c b/src/imap/ngx_imap_handler.c index 6ee6b331a..db0b8cef4 100644 --- a/src/imap/ngx_imap_handler.c +++ b/src/imap/ngx_imap_handler.c @@ -802,7 +802,9 @@ ngx_pop3_auth_state(ngx_event_t *rev) if (arg[0].len == 5) { - if (ngx_strncasecmp(arg[0].data, "LOGIN", 5) == 0) { + if (ngx_strncasecmp(arg[0].data, (u_char *) "LOGIN", 5) + == 0) + { if (s->args.nelts != 1) { rc = NGX_IMAP_PARSE_INVALID_COMMAND; @@ -816,7 +818,10 @@ ngx_pop3_auth_state(ngx_event_t *rev) break; - } else if (ngx_strncasecmp(arg[0].data, "PLAIN", 5) == 0) { + } else if (ngx_strncasecmp(arg[0].data, (u_char *) "PLAIN", + 5) + == 0) + { if (s->args.nelts == 1) { s->imap_state = ngx_pop3_auth_plain; @@ -856,7 +861,9 @@ ngx_pop3_auth_state(ngx_event_t *rev) } } else if (arg[0].len == 8 - && ngx_strncasecmp(arg[0].data, "CRAM-MD5", 8) == 0) + && ngx_strncasecmp(arg[0].data, + (u_char *) "CRAM-MD5", 8) + == 0) { s->imap_state = ngx_pop3_auth_cram_md5; |