projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge pull request #140 from hussainnaqvee/patch-1
[awesomized/libmemcached]
/
src
/
libmemcached
/
sasl.cc
diff --git
a/src/libmemcached/sasl.cc
b/src/libmemcached/sasl.cc
index 849a2256ea9805589e759f7702b89dc85bbc0952..90f663a1262453deb530dfa4a4637b2d9b900371 100644
(file)
--- a/
src/libmemcached/sasl.cc
+++ b/
src/libmemcached/sasl.cc
@@
-1,6
+1,6
@@
/*
+--------------------------------------------------------------------+
/*
+--------------------------------------------------------------------+
- | libmemcached
- C/C++ Client Library for memcached
|
+ | libmemcached
-awesome - C/C++ Client Library for memcached
|
+--------------------------------------------------------------------+
| Redistribution and use in source and binary forms, with or without |
| modification, are permitted under the terms of the BSD license. |
+--------------------------------------------------------------------+
| Redistribution and use in source and binary forms, with or without |
| modification, are permitted under the terms of the BSD license. |
@@
-9,11
+9,12
@@
| the terms online at: https://opensource.org/licenses/BSD-3-Clause |
+--------------------------------------------------------------------+
| Copyright (c) 2006-2014 Brian Aker https://datadifferential.com/ |
| the terms online at: https://opensource.org/licenses/BSD-3-Clause |
+--------------------------------------------------------------------+
| Copyright (c) 2006-2014 Brian Aker https://datadifferential.com/ |
- | Copyright (c) 2020
Michael Wallner <mike@php.net>
|
+ | Copyright (c) 2020
-2021 Michael Wallner https://awesome.co/
|
+--------------------------------------------------------------------+
*/
#include "libmemcached/common.h"
+--------------------------------------------------------------------+
*/
#include "libmemcached/common.h"
+
#include <cassert>
#include <atomic>
#include <cassert>
#include <atomic>
@@
-91,7
+92,11
@@
static memcached_return_t resolve_names(memcached_instance_st &server, char *lad
extern "C" {
static void sasl_shutdown_function() {
extern "C" {
static void sasl_shutdown_function() {
+#if HAVE_SASL_CLIENT_DONE
+ (void) sasl_client_done();
+#else
sasl_done();
sasl_done();
+#endif
}
static std::atomic<int> sasl_startup_state(SASL_OK);
}
static std::atomic<int> sasl_startup_state(SASL_OK);
@@
-466,4
+471,12
@@
memcached_return_t memcached_clone_sasl(memcached_st *, const memcached_st *) {
return MEMCACHED_NOT_SUPPORTED;
}
return MEMCACHED_NOT_SUPPORTED;
}
+memcached_return_t memcached_destroy_sasl_auth_data(memcached_st *) {
+ return MEMCACHED_NOT_SUPPORTED;
+}
+
+memcached_return_t memcached_sasl_authenticate_connection(memcached_instance_st *) {
+ return MEMCACHED_NOT_SUPPORTED;
+}
+
#endif
#endif