diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2013-05-24 17:03:15 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2013-05-24 17:03:15 +0000 |
| commit | 2e9aedcac52e52c6811fcb9385c3afed4d9521c3 (patch) | |
| tree | 841da5f86ad60262c3d85a52a96599096a7d9a94 /usr.sbin/smtpd/dns.c | |
| parent | 4c1642b4756fcf57a9dd4b45a0aa37feee1230a9 (diff) | |
sync with OpenSMTPD 5.3.2
ok gilles@
Diffstat (limited to 'usr.sbin/smtpd/dns.c')
| -rw-r--r-- | usr.sbin/smtpd/dns.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/smtpd/dns.c b/usr.sbin/smtpd/dns.c index 33e0eb5fc40..506f82f027b 100644 --- a/usr.sbin/smtpd/dns.c +++ b/usr.sbin/smtpd/dns.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dns.c,v 1.65 2013/04/30 12:07:21 eric Exp $ */ +/* $OpenBSD: dns.c,v 1.66 2013/05/24 17:03:14 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -48,7 +48,7 @@ struct dns_session { struct mproc *p; uint64_t reqid; int type; - char name[MAXHOSTNAMELEN]; + char name[SMTPD_MAXHOSTNAMELEN]; size_t mxfound; int error; int refcount; @@ -69,7 +69,7 @@ static void dns_dispatch_mx_preference(int, struct async_res *, void *); void dns_query_host(uint64_t id, const char *host) { - m_create(p_lka, IMSG_DNS_HOST, 0, 0, -1, 128); + m_create(p_lka, IMSG_DNS_HOST, 0, 0, -1); m_add_id(p_lka, id); m_add_string(p_lka, host); m_close(p_lka); @@ -78,7 +78,7 @@ dns_query_host(uint64_t id, const char *host) void dns_query_ptr(uint64_t id, const struct sockaddr *sa) { - m_create(p_lka, IMSG_DNS_PTR, 0, 0, -1, 128); + m_create(p_lka, IMSG_DNS_PTR, 0, 0, -1); m_add_id(p_lka, id); m_add_sockaddr(p_lka, sa); m_close(p_lka); @@ -87,7 +87,7 @@ dns_query_ptr(uint64_t id, const struct sockaddr *sa) void dns_query_mx(uint64_t id, const char *domain) { - m_create(p_lka, IMSG_DNS_MX, 0, 0, -1, 128); + m_create(p_lka, IMSG_DNS_MX, 0, 0, -1); m_add_id(p_lka, id); m_add_string(p_lka, domain); m_close(p_lka); @@ -96,7 +96,7 @@ dns_query_mx(uint64_t id, const char *domain) void dns_query_mx_preference(uint64_t id, const char *domain, const char *mx) { - m_create(p_lka, IMSG_DNS_MX_PREFERENCE, 0, 0, -1, 128); + m_create(p_lka, IMSG_DNS_MX_PREFERENCE, 0, 0, -1); m_add_id(p_lka, id); m_add_string(p_lka, domain); m_add_string(p_lka, mx); @@ -171,7 +171,7 @@ dns_dispatch_host(int ev, struct async_res *ar, void *arg) for (ai = ar->ar_addrinfo; ai; ai = ai->ai_next) { s->mxfound++; - m_create(s->p, IMSG_DNS_HOST, 0, 0, -1, 128); + m_create(s->p, IMSG_DNS_HOST, 0, 0, -1); m_add_id(s->p, s->reqid); m_add_sockaddr(s->p, ai->ai_addr); m_add_int(s->p, lookup->preference); @@ -187,7 +187,7 @@ dns_dispatch_host(int ev, struct async_res *ar, void *arg) if (--s->refcount) return; - m_create(s->p, IMSG_DNS_HOST_END, 0, 0, -1, 24); + m_create(s->p, IMSG_DNS_HOST_END, 0, 0, -1); m_add_id(s->p, s->reqid); m_add_int(s->p, s->mxfound ? DNS_OK : DNS_ENOTFOUND); m_close(s->p); @@ -200,7 +200,7 @@ dns_dispatch_ptr(int ev, struct async_res *ar, void *arg) struct dns_session *s = arg; /* The error code could be more precise, but we don't currently care */ - m_create(s->p, IMSG_DNS_PTR, 0, 0, -1, 512); + m_create(s->p, IMSG_DNS_PTR, 0, 0, -1); m_add_id(s->p, s->reqid); m_add_int(s->p, ar->ar_gai_errno ? DNS_ENOTFOUND : DNS_OK); if (ar->ar_gai_errno == 0) @@ -222,7 +222,7 @@ dns_dispatch_mx(int ev, struct async_res *ar, void *arg) if (ar->ar_h_errno && ar->ar_h_errno != NO_DATA) { - m_create(s->p, IMSG_DNS_HOST_END, 0, 0, -1, 24); + m_create(s->p, IMSG_DNS_HOST_END, 0, 0, -1); m_add_id(s->p, s->reqid); if (ar->ar_rcode == NXDOMAIN) m_add_int(s->p, DNS_ENONAME); @@ -297,7 +297,7 @@ dns_dispatch_mx_preference(int ev, struct async_res *ar, void *arg) free(ar->ar_data); - m_create(s->p, IMSG_DNS_MX_PREFERENCE, 0, 0, -1, 36); + m_create(s->p, IMSG_DNS_MX_PREFERENCE, 0, 0, -1); m_add_id(s->p, s->reqid); m_add_int(s->p, error); if (error == DNS_OK) |