* Use and distribution licensed under the BSD license. See
* the COPYING file in the parent directory for full text.
*
- * Summary:
+ * Summary:
*
*/
self->get_key_failure= NULL;
self->delete_trigger= NULL;
self->callbacks= NULL;
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
+ self->sasl.callbacks= NULL;
+ self->sasl.is_allocated= false;
+#endif
return true;
}
return ptr;
}
-void server_list_free(memcached_st *ptr, memcached_server_st *servers)
-{
- uint32_t x;
-
- if (servers == NULL)
- return;
-
- for (x= 0; x < memcached_server_list_count(servers); x++)
- {
- if (servers[x].address_info)
- {
- freeaddrinfo(servers[x].address_info);
- servers[x].address_info= NULL;
- }
- }
-
- if (ptr)
- {
- libmemcached_free(ptr, servers);
- }
- else
- {
- free(servers);
- }
-}
-
void memcached_servers_reset(memcached_st *ptr)
{
- server_list_free(ptr, memcached_server_list(ptr));
+ memcached_server_list_free(memcached_server_list(ptr));
memcached_server_list_set(ptr, NULL);
ptr->number_of_hosts= 0;
{
/* If we have anything open, lets close it now */
memcached_quit(ptr);
- server_list_free(ptr, memcached_server_list(ptr));
+ memcached_server_list_free(memcached_server_list(ptr));
memcached_result_free(&ptr->result);
if (ptr->on_cleanup)
if (ptr->continuum)
libmemcached_free(ptr, ptr->continuum);
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
+ if (ptr->sasl.callbacks != NULL)
+ {
+ memcached_destroy_sasl_auth_data(ptr);
+ }
+#endif
+
if (memcached_is_allocated(ptr))
{
libmemcached_free(ptr, ptr);
new_clone->prefix_key_length= source->prefix_key_length;
}
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
+ if (source->sasl.callbacks)
+ {
+ if (memcached_clone_sasl(new_clone, source) != MEMCACHED_SUCCESS)
+ {
+ memcached_free(new_clone);
+ return NULL;
+ }
+ }
+#endif
+
rc= run_distribution(new_clone);
if (rc != MEMCACHED_SUCCESS)
return &ptr->servers[server_key];
}
-inline memcached_server_instance_st *memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key)
+inline memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key)
{
return &ptr->servers[server_key];
}