SERVER-10330 Fixed build failure on enterprise builds

12 files changed, 133 insertions, 1 deletions

diff --git a/src/mongo/db/mongod_options_test.cpp b/src/mongo/db/mongod_options_test.cpp
index 7ac4bb6e892..f8016b74aea 100644
--- a/src/mongo/db/mongod_options_test.cpp
+++ b/src/mongo/db/mongod_options_test.cpp
@@ -1252,6 +1252,18 @@ namespace {
                 ASSERT_EQUALS(iterator->_positionalStart, -1);
                 ASSERT_EQUALS(iterator->_positionalEnd, -1);
             }
+            else if (iterator->_dottedName == "ssl.allowInvalidCertificates") {
+                ASSERT_EQUALS(iterator->_singleName, "sslAllowInvalidCertificates");
+                ASSERT_EQUALS(iterator->_type, moe::Switch);
+                ASSERT_EQUALS(iterator->_description, "allow connections to servers with invalid certificates");
+                ASSERT_EQUALS(iterator->_isVisible, true);
+                ASSERT_TRUE(iterator->_default.isEmpty());
+                ASSERT_TRUE(iterator->_implicit.isEmpty());
+                ASSERT_EQUALS(iterator->_isComposing, false);
+                ASSERT_EQUALS(iterator->_sources, moe::SourceAll);
+                ASSERT_EQUALS(iterator->_positionalStart, -1);
+                ASSERT_EQUALS(iterator->_positionalEnd, -1);
+            }
             else if (iterator->_dottedName == "ssl.FIPSMode") {
                 ASSERT_EQUALS(iterator->_singleName, "sslFIPSMode");
                 ASSERT_EQUALS(iterator->_type, moe::Switch);
diff --git a/src/mongo/s/mongos_options_test.cpp b/src/mongo/s/mongos_options_test.cpp
index b7b20bd4c93..95f53224f98 100644
--- a/src/mongo/s/mongos_options_test.cpp
+++ b/src/mongo/s/mongos_options_test.cpp
@@ -713,6 +713,18 @@ namespace {
                 ASSERT_EQUALS(iterator->_positionalStart, -1);
                 ASSERT_EQUALS(iterator->_positionalEnd, -1);
             }
+            else if (iterator->_dottedName == "ssl.allowInvalidCertificates") {
+                ASSERT_EQUALS(iterator->_singleName, "sslAllowInvalidCertificates");
+                ASSERT_EQUALS(iterator->_type, moe::Switch);
+                ASSERT_EQUALS(iterator->_description, "allow connections to servers with invalid certificates");
+                ASSERT_EQUALS(iterator->_isVisible, true);
+                ASSERT_TRUE(iterator->_default.isEmpty());
+                ASSERT_TRUE(iterator->_implicit.isEmpty());
+                ASSERT_EQUALS(iterator->_isComposing, false);
+                ASSERT_EQUALS(iterator->_sources, moe::SourceAll);
+                ASSERT_EQUALS(iterator->_positionalStart, -1);
+                ASSERT_EQUALS(iterator->_positionalEnd, -1);
+            }
             else if (iterator->_dottedName == "ssl.FIPSMode") {
                 ASSERT_EQUALS(iterator->_singleName, "sslFIPSMode");
                 ASSERT_EQUALS(iterator->_type, moe::Switch);
diff --git a/src/mongo/shell/shell_options_test.cpp b/src/mongo/shell/shell_options_test.cpp
index 628fa5f5df6..d1e17e64342 100644
--- a/src/mongo/shell/shell_options_test.cpp
+++ b/src/mongo/shell/shell_options_test.cpp
@@ -341,6 +341,18 @@ namespace {
                 ASSERT_EQUALS(iterator->_positionalStart, -1);
                 ASSERT_EQUALS(iterator->_positionalEnd, -1);
             }
+            else if (iterator->_dottedName == "ssl.allowInvalidCertificates") {
+                ASSERT_EQUALS(iterator->_singleName, "sslAllowInvalidCertificates");
+                ASSERT_EQUALS(iterator->_type, moe::Switch);
+                ASSERT_EQUALS(iterator->_description, "allow connections to servers with invalid certificates");
+                ASSERT_EQUALS(iterator->_isVisible, true);
+                ASSERT_TRUE(iterator->_default.isEmpty());
+                ASSERT_TRUE(iterator->_implicit.isEmpty());
+                ASSERT_EQUALS(iterator->_isComposing, false);
+                ASSERT_EQUALS(iterator->_sources, moe::SourceAll);
+                ASSERT_EQUALS(iterator->_positionalStart, -1);
+                ASSERT_EQUALS(iterator->_positionalEnd, -1);
+            }
             else if (iterator->_dottedName == "ssl.FIPSMode") {
                 ASSERT_EQUALS(iterator->_singleName, "sslFIPSMode");
                 ASSERT_EQUALS(iterator->_type, moe::Switch);
diff --git a/src/mongo/tools/mongodump_options_test.cpp b/src/mongo/tools/mongodump_options_test.cpp
index 59a0ac87ea3..b158b39e23a 100644
--- a/src/mongo/tools/mongodump_options_test.cpp
+++ b/src/mongo/tools/mongodump_options_test.cpp
@@ -461,6 +461,18 @@ namespace {
                 ASSERT_EQUALS(iterator->_positionalStart, -1);
                 ASSERT_EQUALS(iterator->_positionalEnd, -1);
             }
+            else if (iterator->_dottedName == "ssl.allowInvalidCertificates") {
+                ASSERT_EQUALS(iterator->_singleName, "sslAllowInvalidCertificates");
+                ASSERT_EQUALS(iterator->_type, moe::Switch);
+                ASSERT_EQUALS(iterator->_description, "allow connections to servers with invalid certificates");
+                ASSERT_EQUALS(iterator->_isVisible, true);
+                ASSERT_TRUE(iterator->_default.isEmpty());
+                ASSERT_TRUE(iterator->_implicit.isEmpty());
+                ASSERT_EQUALS(iterator->_isComposing, false);
+                ASSERT_EQUALS(iterator->_sources, moe::SourceAll);
+                ASSERT_EQUALS(iterator->_positionalStart, -1);
+                ASSERT_EQUALS(iterator->_positionalEnd, -1);
+            }
             else if (iterator->_dottedName == "ssl.FIPSMode") {
                 ASSERT_EQUALS(iterator->_singleName, "sslFIPSMode");
                 ASSERT_EQUALS(iterator->_type, moe::Switch);
diff --git a/src/mongo/tools/mongoexport_options_test.cpp b/src/mongo/tools/mongoexport_options_test.cpp
index 2f3a4bcde8d..9375163567c 100644
--- a/src/mongo/tools/mongoexport_options_test.cpp
+++ b/src/mongo/tools/mongoexport_options_test.cpp
@@ -523,6 +523,18 @@ namespace {
                 ASSERT_EQUALS(iterator->_positionalStart, -1);
                 ASSERT_EQUALS(iterator->_positionalEnd, -1);
             }
+            else if (iterator->_dottedName == "ssl.allowInvalidCertificates") {
+                ASSERT_EQUALS(iterator->_singleName, "sslAllowInvalidCertificates");
+                ASSERT_EQUALS(iterator->_type, moe::Switch);
+                ASSERT_EQUALS(iterator->_description, "allow connections to servers with invalid certificates");
+                ASSERT_EQUALS(iterator->_isVisible, true);
+                ASSERT_TRUE(iterator->_default.isEmpty());
+                ASSERT_TRUE(iterator->_implicit.isEmpty());
+                ASSERT_EQUALS(iterator->_isComposing, false);
+                ASSERT_EQUALS(iterator->_sources, moe::SourceAll);
+                ASSERT_EQUALS(iterator->_positionalStart, -1);
+                ASSERT_EQUALS(iterator->_positionalEnd, -1);
+            }
             else if (iterator->_dottedName == "ssl.FIPSMode") {
                 ASSERT_EQUALS(iterator->_singleName, "sslFIPSMode");
                 ASSERT_EQUALS(iterator->_type, moe::Switch);
diff --git a/src/mongo/tools/mongofiles_options_test.cpp b/src/mongo/tools/mongofiles_options_test.cpp
index 0571b431ad5..478cf696d7a 100644
--- a/src/mongo/tools/mongofiles_options_test.cpp
+++ b/src/mongo/tools/mongofiles_options_test.cpp
@@ -460,6 +460,18 @@ namespace {
                 ASSERT_EQUALS(iterator->_positionalStart, -1);
                 ASSERT_EQUALS(iterator->_positionalEnd, -1);
             }
+            else if (iterator->_dottedName == "ssl.allowInvalidCertificates") {
+                ASSERT_EQUALS(iterator->_singleName, "sslAllowInvalidCertificates");
+                ASSERT_EQUALS(iterator->_type, moe::Switch);
+                ASSERT_EQUALS(iterator->_description, "allow connections to servers with invalid certificates");
+                ASSERT_EQUALS(iterator->_isVisible, true);
+                ASSERT_TRUE(iterator->_default.isEmpty());
+                ASSERT_TRUE(iterator->_implicit.isEmpty());
+                ASSERT_EQUALS(iterator->_isComposing, false);
+                ASSERT_EQUALS(iterator->_sources, moe::SourceAll);
+                ASSERT_EQUALS(iterator->_positionalStart, -1);
+                ASSERT_EQUALS(iterator->_positionalEnd, -1);
+            }
             else if (iterator->_dottedName == "ssl.FIPSMode") {
                 ASSERT_EQUALS(iterator->_singleName, "sslFIPSMode");
                 ASSERT_EQUALS(iterator->_type, moe::Switch);
diff --git a/src/mongo/tools/mongoimport_options_test.cpp b/src/mongo/tools/mongoimport_options_test.cpp
index 6e513efec9c..578ace82599 100644
--- a/src/mongo/tools/mongoimport_options_test.cpp
+++ b/src/mongo/tools/mongoimport_options_test.cpp
@@ -544,6 +544,18 @@ namespace {
                 ASSERT_EQUALS(iterator->_positionalStart, -1);
                 ASSERT_EQUALS(iterator->_positionalEnd, -1);
             }
+            else if (iterator->_dottedName == "ssl.allowInvalidCertificates") {
+                ASSERT_EQUALS(iterator->_singleName, "sslAllowInvalidCertificates");
+                ASSERT_EQUALS(iterator->_type, moe::Switch);
+                ASSERT_EQUALS(iterator->_description, "allow connections to servers with invalid certificates");
+                ASSERT_EQUALS(iterator->_isVisible, true);
+                ASSERT_TRUE(iterator->_default.isEmpty());
+                ASSERT_TRUE(iterator->_implicit.isEmpty());
+                ASSERT_EQUALS(iterator->_isComposing, false);
+                ASSERT_EQUALS(iterator->_sources, moe::SourceAll);
+                ASSERT_EQUALS(iterator->_positionalStart, -1);
+                ASSERT_EQUALS(iterator->_positionalEnd, -1);
+            }
             else if (iterator->_dottedName == "ssl.FIPSMode") {
                 ASSERT_EQUALS(iterator->_singleName, "sslFIPSMode");
                 ASSERT_EQUALS(iterator->_type, moe::Switch);
diff --git a/src/mongo/tools/mongooplog_options_test.cpp b/src/mongo/tools/mongooplog_options_test.cpp
index 861ee8349a6..2306eebc78c 100644
--- a/src/mongo/tools/mongooplog_options_test.cpp
+++ b/src/mongo/tools/mongooplog_options_test.cpp
@@ -437,6 +437,18 @@ namespace {
                 ASSERT_EQUALS(iterator->_positionalStart, -1);
                 ASSERT_EQUALS(iterator->_positionalEnd, -1);
             }
+            else if (iterator->_dottedName == "ssl.allowInvalidCertificates") {
+                ASSERT_EQUALS(iterator->_singleName, "sslAllowInvalidCertificates");
+                ASSERT_EQUALS(iterator->_type, moe::Switch);
+                ASSERT_EQUALS(iterator->_description, "allow connections to servers with invalid certificates");
+                ASSERT_EQUALS(iterator->_isVisible, true);
+                ASSERT_TRUE(iterator->_default.isEmpty());
+                ASSERT_TRUE(iterator->_implicit.isEmpty());
+                ASSERT_EQUALS(iterator->_isComposing, false);
+                ASSERT_EQUALS(iterator->_sources, moe::SourceAll);
+                ASSERT_EQUALS(iterator->_positionalStart, -1);
+                ASSERT_EQUALS(iterator->_positionalEnd, -1);
+            }
             else if (iterator->_dottedName == "ssl.FIPSMode") {
                 ASSERT_EQUALS(iterator->_singleName, "sslFIPSMode");
                 ASSERT_EQUALS(iterator->_type, moe::Switch);
diff --git a/src/mongo/tools/mongorestore_options_test.cpp b/src/mongo/tools/mongorestore_options_test.cpp
index 2dc06fe9d96..43447d0945e 100644
--- a/src/mongo/tools/mongorestore_options_test.cpp
+++ b/src/mongo/tools/mongorestore_options_test.cpp
@@ -546,6 +546,18 @@ namespace {
                 ASSERT_EQUALS(iterator->_positionalStart, -1);
                 ASSERT_EQUALS(iterator->_positionalEnd, -1);
             }
+            else if (iterator->_dottedName == "ssl.allowInvalidCertificates") {
+                ASSERT_EQUALS(iterator->_singleName, "sslAllowInvalidCertificates");
+                ASSERT_EQUALS(iterator->_type, moe::Switch);
+                ASSERT_EQUALS(iterator->_description, "allow connections to servers with invalid certificates");
+                ASSERT_EQUALS(iterator->_isVisible, true);
+                ASSERT_TRUE(iterator->_default.isEmpty());
+                ASSERT_TRUE(iterator->_implicit.isEmpty());
+                ASSERT_EQUALS(iterator->_isComposing, false);
+                ASSERT_EQUALS(iterator->_sources, moe::SourceAll);
+                ASSERT_EQUALS(iterator->_positionalStart, -1);
+                ASSERT_EQUALS(iterator->_positionalEnd, -1);
+            }
             else if (iterator->_dottedName == "ssl.FIPSMode") {
                 ASSERT_EQUALS(iterator->_singleName, "sslFIPSMode");
                 ASSERT_EQUALS(iterator->_type, moe::Switch);
diff --git a/src/mongo/tools/mongostat_options_test.cpp b/src/mongo/tools/mongostat_options_test.cpp
index 373feb67b60..7f48426cf3d 100644
--- a/src/mongo/tools/mongostat_options_test.cpp
+++ b/src/mongo/tools/mongostat_options_test.cpp
@@ -413,6 +413,18 @@ namespace {
                 ASSERT_EQUALS(iterator->_positionalStart, -1);
                 ASSERT_EQUALS(iterator->_positionalEnd, -1);
             }
+            else if (iterator->_dottedName == "ssl.allowInvalidCertificates") {
+                ASSERT_EQUALS(iterator->_singleName, "sslAllowInvalidCertificates");
+                ASSERT_EQUALS(iterator->_type, moe::Switch);
+                ASSERT_EQUALS(iterator->_description, "allow connections to servers with invalid certificates");
+                ASSERT_EQUALS(iterator->_isVisible, true);
+                ASSERT_TRUE(iterator->_default.isEmpty());
+                ASSERT_TRUE(iterator->_implicit.isEmpty());
+                ASSERT_EQUALS(iterator->_isComposing, false);
+                ASSERT_EQUALS(iterator->_sources, moe::SourceAll);
+                ASSERT_EQUALS(iterator->_positionalStart, -1);
+                ASSERT_EQUALS(iterator->_positionalEnd, -1);
+            }
             else if (iterator->_dottedName == "ssl.FIPSMode") {
                 ASSERT_EQUALS(iterator->_singleName, "sslFIPSMode");
                 ASSERT_EQUALS(iterator->_type, moe::Switch);
diff --git a/src/mongo/tools/mongotop_options_test.cpp b/src/mongo/tools/mongotop_options_test.cpp
index 7020164e794..198162d0347 100644
--- a/src/mongo/tools/mongotop_options_test.cpp
+++ b/src/mongo/tools/mongotop_options_test.cpp
@@ -364,6 +364,18 @@ namespace {
                 ASSERT_EQUALS(iterator->_positionalStart, -1);
                 ASSERT_EQUALS(iterator->_positionalEnd, -1);
             }
+            else if (iterator->_dottedName == "ssl.allowInvalidCertificates") {
+                ASSERT_EQUALS(iterator->_singleName, "sslAllowInvalidCertificates");
+                ASSERT_EQUALS(iterator->_type, moe::Switch);
+                ASSERT_EQUALS(iterator->_description, "allow connections to servers with invalid certificates");
+                ASSERT_EQUALS(iterator->_isVisible, true);
+                ASSERT_TRUE(iterator->_default.isEmpty());
+                ASSERT_TRUE(iterator->_implicit.isEmpty());
+                ASSERT_EQUALS(iterator->_isComposing, false);
+                ASSERT_EQUALS(iterator->_sources, moe::SourceAll);
+                ASSERT_EQUALS(iterator->_positionalStart, -1);
+                ASSERT_EQUALS(iterator->_positionalEnd, -1);
+            }
             else if (iterator->_dottedName == "ssl.FIPSMode") {
                 ASSERT_EQUALS(iterator->_singleName, "sslFIPSMode");
                 ASSERT_EQUALS(iterator->_type, moe::Switch);
diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp
index 01edd2b0409..f7ea8b5d5c2 100644
--- a/src/mongo/util/net/ssl_manager.cpp
+++ b/src/mongo/util/net/ssl_manager.cpp
@@ -835,7 +835,7 @@ namespace mongo {
         }
 
         // If Common Name (CN) didn't match, check Subject Alternate Name (SAN)
-        stack_st_GENERAL_NAME *sanNames = static_cast<stack_st_GENERAL_NAME*>
+        STACK_OF(GENERAL_NAME)* sanNames = static_cast<STACK_OF(GENERAL_NAME)*>
             (X509_get_ext_d2i(peerCert, NID_subject_alt_name, NULL, NULL));
         
         bool sanMatch = false;