CXX-402 Allow use of native SCRAM-SHA-1 without cyrus sasl

Author: acmorrow

src/SConscript.client

@@ -109,10 +109,6 @@ clientSourceBasic = [
     'mongo/client/options.cpp',
     'mongo/client/replica_set_monitor.cpp',
     'mongo/client/sasl_client_authenticate.cpp',
-    'mongo/client/sasl_client_authenticate_impl.cpp',
-    'mongo/client/sasl_client_conversation.cpp',
-    'mongo/client/sasl_client_session.cpp',
-    'mongo/client/sasl_plain_client_conversation.cpp',
     'mongo/client/update_write_operation.cpp',
     'mongo/client/wire_protocol_writer.cpp',
     'mongo/client/write_concern.cpp',
@@ -161,14 +157,18 @@ clientSourceBasic = [
 clientSourceTz = [] if (clientEnv['MONGO_HAVE_TIMEGM'] or windows) else ['third_party/tz/timegm.c']
 
 clientSourceSSL = [
+    'mongo/client/native_sasl_client_session.cpp',
+    'mongo/client/sasl_client_authenticate_impl.cpp',
+    'mongo/client/sasl_client_conversation.cpp',
+    'mongo/client/sasl_client_session.cpp',
+    'mongo/client/sasl_plain_client_conversation.cpp',
     'mongo/client/sasl_scramsha1_client_conversation.cpp',
     'mongo/crypto/crypto_openssl.cpp',
     'mongo/crypto/mechanism_scram.cpp',
 ]
 
 clientSourceSasl = [
     'mongo/client/cyrus_sasl_client_session.cpp',
-    'mongo/client/native_sasl_client_session.cpp',
     'mongo/client/sasl_sspi.cpp',
 ]
 

src/mongo/base/initializer_functions.h

@@ -19,10 +19,12 @@ INSTALL_FUNCTION(base_init) // "default"
 INSTALL_FUNCTION(bson_oid) // "OIDGeneration"
 INSTALL_FUNCTION(logger_logstream_builder) // "LogstreamBuilder"
 INSTALL_FUNCTION(logger_logger) // "GlobalLogManager"
-#ifdef MONGO_SASL
+#ifdef MONGO_SSL
 INSTALL_FUNCTION(client_sasl_client_authenticate_impl) // "SaslClientAuthenticateFunction"
-INSTALL_FUNCTION(client_cyrus_sasl_client_session) // "CyrusSaslAllocatorsAndMutexes,CyrusSaslClientContext"
 INSTALL_FUNCTION(client_native_sasl_client_session) // "NativeSaslClientContext"
+#endif
+#ifdef MONGO_SASL
+INSTALL_FUNCTION(client_cyrus_sasl_client_session) // "CyrusSaslAllocatorsAndMutexes,CyrusSaslClientContext"
 INSTALL_FUNCTION(client_sasl_sspi) // "SaslSspiClientPlugin,SaslCramClientPlugin,SaslPlainClientPlugin"
 #endif
 INSTALL_FUNCTION(util_fail_point_service) // "FailPointRegistry,AllFailPointsRegistered"