diff options
| author | Brian Aker <brian@tangent.org> | 2013-06-12 01:17:31 -0700 |
|---|---|---|
| committer | Brian Aker <brian@tangent.org> | 2013-06-12 01:17:31 -0700 |
| commit | 42eab77b8c86c0d04813c8b3c0105defa4f3d8b4 (patch) | |
| tree | fc9fe7c13d32d30ab3930a2ef5e417f7721d91af /libmemcached | |
| parent | 564d0ca1655236d1b8aeb8b271532e2b065a3ff8 (diff) | |
| download | libmemcached-42eab77b8c86c0d04813c8b3c0105defa4f3d8b4.tar.gz | |
Fix issue with sasl symbol
Diffstat (limited to 'libmemcached')
| -rw-r--r-- | libmemcached/connect.cc | 6 | ||||
| -rw-r--r-- | libmemcached/memcached.cc | 4 | ||||
| -rw-r--r-- | libmemcached/sasl.cc | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc index df052adb..168d34a3 100644 --- a/libmemcached/connect.cc +++ b/libmemcached/connect.cc @@ -745,7 +745,7 @@ static memcached_return_t _memcached_connect(memcached_instance_st* server, cons return rc; } - if (LIBMEMCACHED_WITH_SASL_SUPPORT and server->root->sasl.callbacks and memcached_is_udp(server->root)) + if (libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) and server->root->sasl.callbacks and memcached_is_udp(server->root)) { return memcached_set_error(*server, MEMCACHED_INVALID_HOST_PROTOCOL, MEMCACHED_AT, memcached_literal_param("SASL is not supported for UDP connections")); } @@ -762,8 +762,7 @@ static memcached_return_t _memcached_connect(memcached_instance_st* server, cons case MEMCACHED_CONNECTION_TCP: rc= network_connect(server); -#if defined(LIBMEMCACHED_WITH_SASL_SUPPORT) - if (LIBMEMCACHED_WITH_SASL_SUPPORT) + if (libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL)) { if (server->fd != INVALID_SOCKET and server->root->sasl.callbacks) { @@ -775,7 +774,6 @@ static memcached_return_t _memcached_connect(memcached_instance_st* server, cons } } } -#endif break; case MEMCACHED_CONNECTION_UNIX_SOCKET: diff --git a/libmemcached/memcached.cc b/libmemcached/memcached.cc index e1519d1e..2bd81e06 100644 --- a/libmemcached/memcached.cc +++ b/libmemcached/memcached.cc @@ -151,7 +151,7 @@ static void __memcached_free(Memcached *ptr, bool release_st) memcached_error_free(*ptr); - if (LIBMEMCACHED_WITH_SASL_SUPPORT and ptr->sasl.callbacks) + if (libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) and ptr->sasl.callbacks) { memcached_destroy_sasl_auth_data(ptr); } @@ -381,7 +381,7 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source) new_clone->configure.filename= memcached_array_clone(new_clone, source->_namespace); new_clone->configure.version= source->configure.version; - if (LIBMEMCACHED_WITH_SASL_SUPPORT and source->sasl.callbacks) + if (libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) and source->sasl.callbacks) { if (memcached_failed(memcached_clone_sasl(new_clone, source))) { diff --git a/libmemcached/sasl.cc b/libmemcached/sasl.cc index fc69e980..26ad6b17 100644 --- a/libmemcached/sasl.cc +++ b/libmemcached/sasl.cc @@ -540,4 +540,9 @@ memcached_return_t memcached_clone_sasl(memcached_st *, const memcached_st *) return MEMCACHED_NOT_SUPPORTED; } +memcached_return_t memcached_destroy_sasl_auth_data(memcached_st*) +{ + return MEMCACHED_NOT_SUPPORTED; +} + #endif |