diff -up vino-2.28.1/server/libvncserver/rfbserver.c.m1 vino-2.28.1/server/libvncserver/rfbserver.c
--- vino-2.28.1/server/libvncserver/rfbserver.c.m1	2015-08-28 09:34:35.769112768 -0400
+++ vino-2.28.1/server/libvncserver/rfbserver.c	2015-08-28 11:30:13.033112155 -0400
@@ -150,7 +150,7 @@ rfbNewClient(rfbScreenInfoPtr rfbScreen,
     struct sockaddr_storage addr;
     socklen_t addrlen = sizeof(addr);
     int i;
-    char host[NI_MAXHOST];
+    char host[NI_MAXHOST] = "(unresolved)";
     const char *prt = "unknown";
 
     cl = (rfbClientPtr)calloc(sizeof(rfbClientRec),1);
@@ -166,11 +166,11 @@ rfbNewClient(rfbScreenInfoPtr rfbScreen,
 
       getpeername(sock, (struct sockaddr *)&addr, &addrlen);
 
-      getnameinfo((struct sockaddr *)&addr,
-                  addrlen,
-                  host, sizeof(host),
-                  NULL, 0,
-                  0);
+      if ( getnameinfo((struct sockaddr *)&addr, addrlen,
+                        host, sizeof(host), NULL, 0, 0)) {
+        getnameinfo((struct sockaddr *)&addr, addrlen,
+                    host, sizeof(host), NULL, 0, NI_NUMERICHOST);
+      }
 
       cl->host = strdup(host);
 
