Mercurial > dovecot > core-2.2
diff src/lib/net.c @ 18500:4903ab967807
lib: net_addr2ip() sets the family now only after address is successfully converted.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Wed, 29 Apr 2015 17:35:18 +0200 |
parents | 3009a1a6f6d5 |
children | aabfe48db1cf |
line wrap: on
line diff
--- a/src/lib/net.c Wed Apr 29 17:19:34 2015 +0200 +++ b/src/lib/net.c Wed Apr 29 17:35:18 2015 +0200 @@ -919,7 +919,6 @@ if (strchr(addr, ':') != NULL) { /* IPv6 */ - ip->family = AF_INET6; #ifdef HAVE_IPV6 T_BEGIN { if (addr[0] == '[') { @@ -935,13 +934,13 @@ #else ip->u.ip4.s_addr = 0; #endif + ip->family = AF_INET6; } else { /* IPv4 */ - ip->family = AF_INET; if (inet_aton(addr, &ip->u.ip4) == 0) return -1; + ip->family = AF_INET; } - return 0; }