FEATURE: Implement a SASL auxprop plugin for Zookeeper-based ACL

Author: singsangssong

Makefile.am

@@ -133,6 +133,9 @@ noinst_LIBRARIES = libarcuszk.a
 libarcuszk_a_SOURCES = arcus_zk.c arcus_zk.h \
                        arcus_hb.c arcus_hb.h \
                        cluster_config.c cluster_config.h
+if ENABLE_SASL
+libarcuszk_a_SOURCES += sasl_auxprop.c sasl_auxprop.h
+endif
 # Do not use AM_CFLAGS which includes -pedantic.
 # We do not want that flag when compiling arcus_zk.c.
 libarcuszk_a_CFLAGS = @PROFILER_FLAGS@ @ARCUSZK_CFLAGS@

memcached.c

@@ -15927,10 +15927,6 @@ int main (int argc, char **argv)
         }
     }
 
-#ifdef SASL_ENABLED
-    init_sasl();
-#endif /* SASL */
-
     /* daemonize if requested */
     /* if we want to ensure our ability to dump core, don't chdir to / */
     if (do_daemonize) {
@@ -15945,6 +15941,12 @@ int main (int argc, char **argv)
         }
     }
 
+#ifdef SASL_ENABLED
+    if (settings.require_sasl) {
+        init_sasl();
+    }
+#endif
+
     /* lock paged memory if needed */
     if (lock_memory) {
 #ifdef HAVE_MLOCKALL
@@ -16145,10 +16147,6 @@ int main (int argc, char **argv)
     }
 #endif
 
-#ifdef SASL_ENABLED
-    shutdown_sasl();
-#endif /* SASL */
-
     /* 3) close listen sockes not to accept new connections */
     close_listen_sockets();
     mc_logger->log(EXTENSION_LOG_INFO, NULL, "Listen sockets closed.\n");
@@ -16192,6 +16190,12 @@ int main (int argc, char **argv)
 #ifdef DETECT_LONG_QUERY
     lqdetect_final(); /* finalize long query detection */
 #endif
+#ifdef SASL_ENABLED
+    if (settings.require_sasl) {
+        shutdown_sasl();
+    }
+#endif
+
     mc_engine.v1->destroy(mc_engine.v0);
     mc_logger->log(EXTENSION_LOG_INFO, NULL, "Memcached engine destroyed.\n");