lib: uri-util - Use IP over host name string in construction of URI host name.

Both can be set when the URI was parsed earlier from a string or when the caller
sets both. There is never a valid case where these separate fields would yield a
completely different URI. Using the IP when available is necessary to make
sure IPv6 literals are output correctly; don't trust the caller to get it right.

diff --git a/src/lib/uri-util.c b/src/lib/uri-util.c
index 79972f9829afcc8da8981d908839410dc6e5137a..8cd6d48170029c67be2ad612a0764a117c19bfcd 100644 (file)
--- a/src/lib/uri-util.c
+++ b/src/lib/uri-util.c
@@ -1291,14 +1291,16 @@ void uri_append_host_ip(string_t *out, const struct ip_addr *host_ip)
 
 void uri_append_host(string_t *out, const struct uri_host *host)
 {
-       if (host->name != NULL) {
+       if (host->ip.family != 0)
+               uri_append_host_ip(out, &host->ip);
+       else {
+               i_assert(host->name != NULL);
                /* Assume IPv6 literal if starts with '['; avoid encoding */
                if (*host->name == '[')
                        str_append(out, host->name);
                else
                        uri_append_host_name(out, host->name);
-       } else
-               uri_append_host_ip(out, &host->ip);
+       }
 }
 
 void uri_append_port(string_t *out, in_port_t port)