Merge branch 'CDRIVER-1998-handshake'

* CDRIVER-1998-handshake:
  CDRIVER-1998: Bump the handshake configure flags

Author: bjori

examples/parse_handshake_cfg.py

@@ -19,6 +19,9 @@
     "MONGOC_MD_FLAG_HAVE_WEAK_SYMBOLS",
     "MONGOC_MD_FLAG_NO_AUTOMATIC_GLOBALS",
     "MONGOC_MD_FLAG_ENABLE_SSL_LIBRESSL",
+    "MONGOC_MD_FLAG_ENABLE_SASL_CYRUS",
+    "MONGOC_MD_FLAG_ENABLE_SASL_SSPI",
+    "MONGOC_MD_FLAG_HAVE_SOCKLEN",
 ]
 
 def main():

src/mongoc/mongoc-handshake-private.h

@@ -55,7 +55,10 @@ typedef enum {
    MONGOC_MD_FLAG_HAVE_SASL_CLIENT_DONE = 1 << 11,
    MONGOC_MD_FLAG_HAVE_WEAK_SYMBOLS = 1 << 12,
    MONGOC_MD_FLAG_NO_AUTOMATIC_GLOBALS = 1 << 13,
-   MONGOC_MD_FLAG_ENABLE_SSL_LIBRESSL = 1 << 14
+   MONGOC_MD_FLAG_ENABLE_SSL_LIBRESSL = 1 << 14,
+   MONGOC_MD_FLAG_ENABLE_SASL_CYRUS = 1 << 15,
+   MONGOC_MD_FLAG_ENABLE_SASL_SSPI = 1 << 16,
+   MONGOC_MD_FLAG_HAVE_SOCKLEN = 1 << 17,
 } mongoc_handshake_config_flags_t;
 
 

src/mongoc/mongoc-handshake.c

@@ -109,6 +109,18 @@ _get_config_bitfield (void)
    bf |= MONGOC_MD_FLAG_ENABLE_SSL_LIBRESSL;
 #endif
 
+#ifdef MONGOC_ENABLE_SASL_CYRUS
+   bf |= MONGOC_MD_FLAG_ENABLE_SASL_CYRUS;
+#endif
+
+#ifdef MONGOC_ENABLE_SASL_SSPI
+   bf |= MONGOC_MD_FLAG_ENABLE_SASL_SSPI;
+#endif
+
+#ifdef MONGOC_HAVE_SOCKLEN
+   bf |= MONGOC_MD_FLAG_HAVE_SOCKLEN;
+#endif
+
    return bf;
 }