IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

*) fix resolving an empty name ("."),

Browse Source 
*) add quotes in an error message,
*) backout r3299 in ngx_mail_smtp_handler.c
This commit is contained in:
Igor Sysoev 2009-11-09 19:15:11 +00:00
parent 70966c154f
commit a59ba33060
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/ngx_resolver.c
View File

@ -1754,7 +1754,8 @@ ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
query->nns_hi = 0; query->nns_lo = 0; query->nns_hi = 0; query->nns_lo = 0;
query->nar_hi = 0; query->nar_lo = 0; query->nar_hi = 0; query->nar_lo = 0;
p += sizeof(ngx_resolver_query_t) + 1 + ctx->name.len + 1; p += sizeof(ngx_resolver_query_t)
+ ctx->name.len ? (1 + ctx->name.len + 1) : 1;
qs = (ngx_resolver_qs_t *) p; qs = (ngx_resolver_qs_t *) p;

15
src/mail/ngx_mail_smtp_handler.c
View File

@ -124,19 +124,6 @@ ngx_mail_smtp_resolve_addr_handler(ngx_resolver_ctx_t *ctx)
return; return;
} }
if (ctx->name.len == 0) {
ngx_log_error(NGX_LOG_ERR, c->log, 0,
"%V has been resolved to zero name", &c->addr_text);
s->host = smtp_unavailable;
ngx_resolve_addr_done(ctx);
ngx_mail_smtp_greeting(s, s->connection);
return;
}
c->log->action = "in resolving client hostname"; c->log->action = "in resolving client hostname";
s->host.data = ngx_pstrdup(c->pool, &ctx->name); s->host.data = ngx_pstrdup(c->pool, &ctx->name);
@ -204,7 +191,7 @@ ngx_mail_smtp_resolve_name_handler(ngx_resolver_ctx_t *ctx)
if (ctx->state) { if (ctx->state) {
ngx_log_error(NGX_LOG_ERR, c->log, 0, ngx_log_error(NGX_LOG_ERR, c->log, 0,
"%V could not be resolved (%i: %s)", "\"%V\" could not be resolved (%i: %s)",
&ctx->name, ctx->state, &ctx->name, ctx->state,
ngx_resolver_strerror(ctx->state)); ngx_resolver_strerror(ctx->state));