X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fconnect.cc;h=2de01494eae5476a7b2860a38ff74d2e734cf14b;hb=61b948a92ab79734b009a438b5cf3bfad03cb59d;hp=006810bf68e7bab59aed176858253dd2999fbe33;hpb=4c1122cf139f7b073807f0a9187306518988a08f;p=awesomized%2Flibmemcached

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index 006810bf..2de01494 100644
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -146,7 +146,7 @@ static memcached_return_t connect_poll(memcached_instance_st* server, const int
         return memcached_set_errno(*server, errno, MEMCACHED_AT, memcached_literal_param("getsockopt() errored while looking up error state from poll()"));
       }
 
-      // We check the value to see what happened wth the socket.
+      // We check the value to see what happened with the socket.
       if (err == 0) // Should not happen
       {
         return MEMCACHED_SUCCESS;
@@ -466,7 +466,10 @@ static memcached_return_t unix_socket_connect(memcached_instance_st* server)
 
     memset(&servAddr, 0, sizeof (struct sockaddr_un));
     servAddr.sun_family= AF_UNIX;
-    strncpy(servAddr.sun_path, server->hostname(), sizeof(servAddr.sun_path)); /* Copy filename */
+    if (strlen(server->hostname()) >= sizeof(servAddr.sun_path)) {
+        return memcached_set_error(*server, MEMCACHED_UNIX_SOCKET_PATH_TOO_BIG, MEMCACHED_AT);
+    }
+    strncpy(servAddr.sun_path, server->hostname(), sizeof(servAddr.sun_path)-1); /* Copy filename */
 
     if (connect(server->fd, (struct sockaddr *)&servAddr, sizeof(servAddr)) == -1)
     {
@@ -474,6 +477,7 @@ static memcached_return_t unix_socket_connect(memcached_instance_st* server)
       {
       case EINPROGRESS:
       case EALREADY:
+      case EAGAIN:
         server->events(POLLOUT);
         break;
 
@@ -534,13 +538,6 @@ static memcached_return_t network_connect(memcached_instance_st* server)
   /* Create the socket */
   while (server->address_info_next and server->fd == INVALID_SOCKET)
   {
-    /* Memcache server does not support IPV6 in udp mode, so skip if not ipv4 */
-    if (memcached_is_udp(server->root) and server->address_info_next->ai_family != AF_INET)
-    {
-      server->address_info_next= server->address_info_next->ai_next;
-      continue;
-    }
-
     int type= server->address_info_next->ai_socktype;
     if (SOCK_CLOEXEC != 0)
     {