X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fconnect.cc;h=aa2c7def7e4904c7f769d43bdf4c459be9333ee7;hb=1cd9d18499cc945862e8f9b3d16e9d673441df14;hp=da6cf80229a38863727dff15539b0c010fcd2122;hpb=77c9719d429337239b3f5e3d7fc5c17492682a77;p=m6w6%2Flibmemcached

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index da6cf802..aa2c7def 100644
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -155,11 +155,12 @@ static memcached_return_t set_hostinfo(org::libmemcached::Instance* server)
     server->address_info_next= NULL;
   }
 
-  char str_port[NI_MAXSERV];
-  int length= snprintf(str_port, NI_MAXSERV, "%u", uint32_t(server->port()));
-  if (length >= NI_MAXSERV or length <= 0)
+  char str_port[MEMCACHED_NI_MAXSERV];
+  int length= snprintf(str_port, MEMCACHED_NI_MAXSERV, "%u", uint32_t(server->port()));
+  if (length >= MEMCACHED_NI_MAXSERV or length <= 0)
   {
-    return MEMCACHED_FAILURE;
+    return memcached_set_error(*server, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, 
+                               memcached_literal_param("snprintf(NI_MAXSERV)"));
   }
 
   struct addrinfo hints;
@@ -734,6 +735,7 @@ static memcached_return_t _memcached_connect(org::libmemcached::Instance* server
       if (server->fd != INVALID_SOCKET and server->root->sasl.callbacks)
       {
         rc= memcached_sasl_authenticate_connection(server);
+        fprintf(stderr, "%s:%d %s\n", __FILE__, __LINE__, memcached_strerror(NULL, rc));
         if (memcached_failed(rc) and server->fd != INVALID_SOCKET)
         {
           WATCHPOINT_ASSERT(server->fd != INVALID_SOCKET);