@@ -70,7 +70,7 @@ function MONGODB_ADD_SOURCES(dir, file_list)
7070}
7171
7272ARG_ENABLE ( "mongodb" , "MongoDB support" , "no" ) ;
73- ARG_WITH ( "mongodb-sasl" , "MongoDB: Build with SASL (cyrus, sspi) " , "yes" ) ;
73+ ARG_WITH ( "mongodb-sasl" , "MongoDB: Build with SSPI SASL " , "yes" ) ;
7474ARG_WITH ( "mongodb-client-side-encryption" , "MongoDB: Enable client-side encryption" , "yes" ) ;
7575
7676if ( PHP_MONGODB != "no" ) {
@@ -237,12 +237,12 @@ if (PHP_MONGODB != "no") {
237237 CHECK_HEADER_ADD_INCLUDE ( "sasl/sasl.h" , "CFLAGS_MONGODB" ) ) {
238238 mongoc_opts . MONGOC_ENABLE_SASL = 1 ;
239239
240- if ( PHP_MONGODB_SASL == "yes" || PHP_MONGODB_SASL == "cyrus" ) {
241- mongoc_opts . MONGOC_ENABLE_SASL_CYRUS = 1 ;
240+ // TODO 3.0: Remove warning on "yes" as it implies "sspi"
241+ if ( PHP_MONGODB_SASL == "yes" ) {
242+ WARNING ( "Cyrus SASL support for Windows was removed. Falling back to SSPI." ) ;
243+ }
242244
243- // Referenced by _mongoc_cyrus_verifyfile_cb in mongoc-cyrus.c on Windows
244- ADD_FLAG ( "CFLAGS_MONGODB" , "/D MONGOC_CYRUS_PLUGIN_PATH_PREFIX=NULL" ) ;
245- } else if ( PHP_MONGODB_SASL == "sspi" ) {
245+ if ( PHP_MONGODB_SASL == "yes" || PHP_MONGODB_SASL == "sspi" ) {
246246 mongoc_opts . MONGOC_ENABLE_SASL_SSPI = 1 ;
247247 } else {
248248 WARNING ( "mongodb sasl support not enabled, unknown value for PHP_MONGODB_SASL: " + PHP_MONGODB_SASL ) ;
0 commit comments