_dbus_listen_tcp_socket: use NI_NUMERICSERV to determine port number

If we happen to have been given (say) port 30865, we want to
represent that as host=localhost,port=30865 and not
host=localhost,port=csync2.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=87999

diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index f4a42d89f8740500e1b8f8672be764173b2a56db..f6ec8abc521ae1ceb80e0ee1e3185c9ac451660c 100644 (file)
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -1518,7 +1518,7 @@ _dbus_listen_tcp_socket (const char     *host,
               if (result == -1 ||
                   (res = getnameinfo ((struct sockaddr*)&addr, addrlen, NULL, 0,
                                       portbuf, sizeof(portbuf),
-                                      NI_NUMERICHOST)) != 0)
+                                      NI_NUMERICHOST | NI_NUMERICSERV)) != 0)
                 {
                   dbus_set_error (error, _dbus_error_from_errno (errno),
                                   "Failed to resolve port \"%s:%s\": %s (%s)",