X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fsasl.cc;h=21a53de4b10ad7050c91864091a56a71b7562c0b;hb=26dd4e6e3d500ce8f8865db4071e2508e604864e;hp=637ceeef13fc26dd8a853b550025332165d9b66d;hpb=c8a5aecba8e189092266f304ca81ab42625edf60;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/sasl.cc b/src/libmemcached/sasl.cc
index 637ceeef..21a53de4 100644
--- 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.    |
@@ -9,11 +9,12 @@
     | 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 <cassert>
 #include <atomic>
 
@@ -168,7 +169,7 @@ memcached_return_t memcached_sasl_authenticate_connection(memcached_instance_st
   }
 
   int pthread_error;
-  if ((pthread_error = pthread_once(&sasl_startup_once, sasl_startup_function)) != 0) {
+  if ((pthread_error = pthread_once(&sasl_startup_once, sasl_startup_function))) {
     return memcached_set_errno(*server, pthread_error, MEMCACHED_AT);
   }
 
@@ -394,7 +395,8 @@ memcached_return_t memcached_clone_sasl(memcached_st *clone, const memcached_st
     switch (source->sasl.callbacks[total].id) {
     case SASL_CB_USER:
     case SASL_CB_AUTHNAME:
-    case SASL_CB_PASS: break;
+    case SASL_CB_PASS:
+      break;
     default:
       /* I don't know how to deal with this... */
       return MEMCACHED_NOT_SUPPORTED;
@@ -465,4 +467,12 @@ 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;
+}
+
+memcached_return_t memcached_sasl_authenticate_connection(memcached_instance_st *) {
+  return MEMCACHED_NOT_SUPPORTED;
+}
+
 #endif