summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamon Fernandez <ramon.fernandez@mongodb.com>2015-07-27 13:02:25 -0400
committerRamon Fernandez <ramon.fernandez@mongodb.com>2015-07-27 13:02:25 -0400
commita466693f46fdd7a539dc99389a7258c9290ed3aa (patch)
tree3fd27a64a25112be6f945a2e77a35cf62b445384
parent28755e55fc0bacec85a228015dc1f62f3feb65a2 (diff)
downloadmongo-a466693f46fdd7a539dc99389a7258c9290ed3aa.tar.gz
Revert "SERVER-19538 fassert instead of calling dbexit() when cert is expired."
This reverts commit b6cc64fab37049438a061e93946b0aa4a5b15686.
-rw-r--r--src/mongo/util/net/ssl_manager.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp
index 40cc3705da6..3d0dcd47624 100644
--- a/src/mongo/util/net/ssl_manager.cpp
+++ b/src/mongo/util/net/ssl_manager.cpp
@@ -755,9 +755,10 @@ namespace mongo {
return false;
}
- if ((notBeforeMillis > curTimeMillis64()) || (curTimeMillis64() > notAfterMillis)) {
- severe() << "The provided SSL certificate is expired or not yet valid.";
- fassertFailedNoTrace(28652);
+ if ((notBeforeMillis > curTimeMillis64()) ||
+ (curTimeMillis64() > notAfterMillis)) {
+ dbexit(EXIT_BADOPTIONS,
+ "The provided SSL certificate is expired or not yet valid.");
}
*serverCertificateExpirationDate = Date_t(notAfterMillis);