Mercurial > dovecot > original-hg > dovecot-1.2
changeset 5673:dc8d38798296 HEAD
If getnameinfo() fails, use gai_strerror() as well to return the error
string.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sun, 10 Jun 2007 22:21:58 +0300 |
| parents | ca38eb4189e8 |
| children | f55afcf1ff7d |
| files | src/lib/network.c |
| diffstat | 1 files changed, 4 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib/network.c Mon Jun 04 14:50:50 2007 +0300 +++ b/src/lib/network.c Sun Jun 10 22:21:58 2007 +0300 @@ -435,10 +435,10 @@ if (host_error != 0) return host_error; - if (getnameinfo(ai->ai_addr, ai->ai_addrlen, hbuf, - sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0) - return 1; - + host_error = getnameinfo(ai->ai_addr, ai->ai_addrlen, hbuf, + sizeof(hbuf), NULL, 0, NI_NUMERICHOST); + if (host_error != 0) + return host_error; /* get number of IPs */ origai = ai; @@ -595,11 +595,6 @@ #ifdef HAVE_IPV6 i_assert(error != 0); - if (error == 1) { - /* getnameinfo() failed */ - return strerror(errno); - } - return gai_strerror(error); #else switch (error) {