summaryrefslogtreecommitdiff
path: root/src/mongo/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/client')
-rw-r--r--src/mongo/client/connection_string.cpp2
-rw-r--r--src/mongo/client/cyrus_sasl_client_session.cpp10
-rw-r--r--src/mongo/client/dbclient_base.h2
-rw-r--r--src/mongo/client/dbclient_connection.h2
-rw-r--r--src/mongo/client/fetcher.cpp2
-rw-r--r--src/mongo/client/mongo_uri.cpp2
-rw-r--r--src/mongo/client/mongo_uri_connect.cpp2
-rw-r--r--src/mongo/client/native_sasl_client_session.cpp7
-rw-r--r--src/mongo/client/query_spec.h2
-rw-r--r--src/mongo/client/read_preference.cpp2
-rw-r--r--src/mongo/client/remote_command_targeter_rs.cpp2
-rw-r--r--src/mongo/client/sasl_client_authenticate.cpp4
-rw-r--r--src/mongo/client/sasl_client_session.cpp2
-rw-r--r--src/mongo/client/sasl_scram_client_conversation.cpp8
-rw-r--r--src/mongo/client/sasl_sspi.cpp18
15 files changed, 31 insertions, 36 deletions
diff --git a/src/mongo/client/connection_string.cpp b/src/mongo/client/connection_string.cpp
index 9cf9c96ed54..0fe85348b61 100644
--- a/src/mongo/client/connection_string.cpp
+++ b/src/mongo/client/connection_string.cpp
@@ -34,7 +34,7 @@
#include "mongo/client/connection_string.h"
#include "mongo/base/status_with.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
namespace mongo {
diff --git a/src/mongo/client/cyrus_sasl_client_session.cpp b/src/mongo/client/cyrus_sasl_client_session.cpp
index d2201be2149..36d7d588142 100644
--- a/src/mongo/client/cyrus_sasl_client_session.cpp
+++ b/src/mongo/client/cyrus_sasl_client_session.cpp
@@ -36,8 +36,8 @@
#include "mongo/util/allocator.h"
#include "mongo/util/assert_util.h"
#include "mongo/util/concurrency/mutex.h"
-#include "mongo/util/mongoutils/str.h"
#include "mongo/util/signal_handlers_synchronous.h"
+#include "mongo/util/str.h"
namespace mongo {
namespace {
@@ -146,9 +146,9 @@ MONGO_INITIALIZER_WITH_PREREQUISITES(CyrusSaslClientContext,
int result = sasl_client_init(saslClientGlobalCallbacks);
if (result != SASL_OK) {
return Status(ErrorCodes::UnknownError,
- mongoutils::str::stream() << "Could not initialize sasl client components ("
- << sasl_errstring(result, NULL, NULL)
- << ")");
+ str::stream() << "Could not initialize sasl client components ("
+ << sasl_errstring(result, NULL, NULL)
+ << ")");
}
SaslClientSession::create = createCyrusSaslClientSession;
@@ -268,7 +268,7 @@ Status CyrusSaslClientSession::initialize() {
if (SASL_OK != result) {
return Status(ErrorCodes::UnknownError,
- mongoutils::str::stream() << sasl_errstring(result, NULL, NULL));
+ str::stream() << sasl_errstring(result, NULL, NULL));
}
return Status::OK();
diff --git a/src/mongo/client/dbclient_base.h b/src/mongo/client/dbclient_base.h
index a125b0f5f68..626c64d4102 100644
--- a/src/mongo/client/dbclient_base.h
+++ b/src/mongo/client/dbclient_base.h
@@ -53,7 +53,7 @@
#include "mongo/transport/message_compressor_manager.h"
#include "mongo/transport/session.h"
#include "mongo/transport/transport_layer.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
namespace mongo {
diff --git a/src/mongo/client/dbclient_connection.h b/src/mongo/client/dbclient_connection.h
index 6b93b911fe7..13788423545 100644
--- a/src/mongo/client/dbclient_connection.h
+++ b/src/mongo/client/dbclient_connection.h
@@ -53,7 +53,7 @@
#include "mongo/transport/message_compressor_manager.h"
#include "mongo/transport/session.h"
#include "mongo/transport/transport_layer.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
namespace mongo {
diff --git a/src/mongo/client/fetcher.cpp b/src/mongo/client/fetcher.cpp
index 4878449a820..8e707c0ce02 100644
--- a/src/mongo/client/fetcher.cpp
+++ b/src/mongo/client/fetcher.cpp
@@ -41,8 +41,8 @@
#include "mongo/util/assert_util.h"
#include "mongo/util/destructor_guard.h"
#include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
#include "mongo/util/scopeguard.h"
+#include "mongo/util/str.h"
namespace mongo {
diff --git a/src/mongo/client/mongo_uri.cpp b/src/mongo/client/mongo_uri.cpp
index c001508b802..065da5fd016 100644
--- a/src/mongo/client/mongo_uri.cpp
+++ b/src/mongo/client/mongo_uri.cpp
@@ -49,7 +49,7 @@
#include "mongo/util/dns_name.h"
#include "mongo/util/dns_query.h"
#include "mongo/util/hex.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
using namespace std::literals::string_literals;
diff --git a/src/mongo/client/mongo_uri_connect.cpp b/src/mongo/client/mongo_uri_connect.cpp
index 9b09f066a16..e79b6271ee6 100644
--- a/src/mongo/client/mongo_uri_connect.cpp
+++ b/src/mongo/client/mongo_uri_connect.cpp
@@ -36,8 +36,8 @@
#include "mongo/client/authenticate.h"
#include "mongo/client/dbclient_base.h"
#include "mongo/db/auth/sasl_command_constants.h"
-#include "mongo/util/mongoutils/str.h"
#include "mongo/util/password_digest.h"
+#include "mongo/util/str.h"
#include <boost/algorithm/string/case_conv.hpp>
#include <boost/algorithm/string/classification.hpp>
diff --git a/src/mongo/client/native_sasl_client_session.cpp b/src/mongo/client/native_sasl_client_session.cpp
index 055d2443002..b7f51fa0f68 100644
--- a/src/mongo/client/native_sasl_client_session.cpp
+++ b/src/mongo/client/native_sasl_client_session.cpp
@@ -38,7 +38,7 @@
#include "mongo/client/scram_client_cache.h"
#include "mongo/crypto/sha1_block.h"
#include "mongo/crypto/sha256_block.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
namespace mongo {
namespace {
@@ -79,8 +79,7 @@ Status NativeSaslClientSession::initialize() {
new SaslSCRAMClientConversationImpl<SHA256Block>(this, scramsha256ClientCache));
} else {
return Status(ErrorCodes::BadValue,
- mongoutils::str::stream() << "SASL mechanism " << mechanism
- << " is not supported");
+ str::stream() << "SASL mechanism " << mechanism << " is not supported");
}
return Status::OK();
@@ -89,7 +88,7 @@ Status NativeSaslClientSession::initialize() {
Status NativeSaslClientSession::step(StringData inputData, std::string* outputData) {
if (!_saslConversation) {
return Status(ErrorCodes::BadValue,
- mongoutils::str::stream()
+ str::stream()
<< "The client authentication session has not been properly initialized");
}
diff --git a/src/mongo/client/query_spec.h b/src/mongo/client/query_spec.h
index b421d6bca08..c115f50cd70 100644
--- a/src/mongo/client/query_spec.h
+++ b/src/mongo/client/query_spec.h
@@ -31,7 +31,7 @@
#include "mongo/bson/bsonobj.h"
#include "mongo/client/query.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
namespace mongo {
/**
diff --git a/src/mongo/client/read_preference.cpp b/src/mongo/client/read_preference.cpp
index f574ad0ef0a..4391db7c388 100644
--- a/src/mongo/client/read_preference.cpp
+++ b/src/mongo/client/read_preference.cpp
@@ -40,7 +40,7 @@
#include "mongo/bson/bsontypes.h"
#include "mongo/bson/util/bson_extract.h"
#include "mongo/util/assert_util.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
namespace mongo {
namespace {
diff --git a/src/mongo/client/remote_command_targeter_rs.cpp b/src/mongo/client/remote_command_targeter_rs.cpp
index 3df6dca86a5..25a242c9042 100644
--- a/src/mongo/client/remote_command_targeter_rs.cpp
+++ b/src/mongo/client/remote_command_targeter_rs.cpp
@@ -40,8 +40,8 @@
#include "mongo/db/operation_context.h"
#include "mongo/util/assert_util.h"
#include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
#include "mongo/util/net/hostandport.h"
+#include "mongo/util/str.h"
namespace mongo {
diff --git a/src/mongo/client/sasl_client_authenticate.cpp b/src/mongo/client/sasl_client_authenticate.cpp
index 6120b310678..aafc6523494 100644
--- a/src/mongo/client/sasl_client_authenticate.cpp
+++ b/src/mongo/client/sasl_client_authenticate.cpp
@@ -35,12 +35,10 @@
#include "mongo/bson/util/bson_extract.h"
#include "mongo/db/auth/sasl_command_constants.h"
#include "mongo/util/base64.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
namespace mongo {
-using namespace mongoutils;
-
Future<void> (*saslClientAuthenticate)(auth::RunCommandHook runCommand,
const HostAndPort& hostname,
const BSONObj& saslParameters) = nullptr;
diff --git a/src/mongo/client/sasl_client_session.cpp b/src/mongo/client/sasl_client_session.cpp
index 03988c19548..4c92134a094 100644
--- a/src/mongo/client/sasl_client_session.cpp
+++ b/src/mongo/client/sasl_client_session.cpp
@@ -33,8 +33,8 @@
#include "mongo/util/allocator.h"
#include "mongo/util/assert_util.h"
#include "mongo/util/concurrency/mutex.h"
-#include "mongo/util/mongoutils/str.h"
#include "mongo/util/signal_handlers_synchronous.h"
+#include "mongo/util/str.h"
namespace mongo {
SaslClientSession::SaslClientSessionFactoryFn SaslClientSession::create;
diff --git a/src/mongo/client/sasl_scram_client_conversation.cpp b/src/mongo/client/sasl_scram_client_conversation.cpp
index 079b348518f..c5a4b788f32 100644
--- a/src/mongo/client/sasl_scram_client_conversation.cpp
+++ b/src/mongo/client/sasl_scram_client_conversation.cpp
@@ -37,8 +37,8 @@
#include "mongo/client/scram_client_cache.h"
#include "mongo/platform/random.h"
#include "mongo/util/base64.h"
-#include "mongo/util/mongoutils/str.h"
#include "mongo/util/password_digest.h"
+#include "mongo/util/str.h"
#include "mongo/util/text.h"
namespace mongo {
@@ -57,9 +57,9 @@ StatusWith<bool> SaslSCRAMClientConversation::step(StringData inputData, std::st
case 3:
return _thirdStep(inputData, outputData);
default:
- return StatusWith<bool>(
- ErrorCodes::AuthenticationFailed,
- mongoutils::str::stream() << "Invalid SCRAM authentication step: " << _step);
+ return StatusWith<bool>(ErrorCodes::AuthenticationFailed,
+ str::stream() << "Invalid SCRAM authentication step: "
+ << _step);
}
}
diff --git a/src/mongo/client/sasl_sspi.cpp b/src/mongo/client/sasl_sspi.cpp
index 64ecf494d53..fa011a458a0 100644
--- a/src/mongo/client/sasl_sspi.cpp
+++ b/src/mongo/client/sasl_sspi.cpp
@@ -40,8 +40,8 @@
#include "mongo/base/status.h"
#include "mongo/client/sasl_sspi_options.h"
#include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
#include "mongo/util/scopeguard.h"
+#include "mongo/util/str.h"
#include "mongo/util/text.h"
extern "C" int plain_client_plug_init(const sasl_utils_t* utils,
@@ -98,7 +98,7 @@ void HandleLastError(const sasl_utils_t* utils, DWORD errCode, const char* msg)
return;
}
- std::string buffer(mongoutils::str::stream() << "SSPI: " << msg << ": " << err);
+ std::string buffer(str::stream() << "SSPI: " << msg << ": " << err);
saslSetError(utils, buffer);
LocalFree(err);
}
@@ -481,10 +481,9 @@ MONGO_INITIALIZER_WITH_PREREQUISITES(SaslSspiClientPlugin,
int ret = sasl_client_add_plugin(sspiPluginName, sspiClientPluginInit);
if (SASL_OK != ret) {
return Status(ErrorCodes::UnknownError,
- mongoutils::str::stream() << "could not add SASL Client SSPI plugin "
- << sspiPluginName
- << ": "
- << sasl_errstring(ret, NULL, NULL));
+ str::stream() << "could not add SASL Client SSPI plugin " << sspiPluginName
+ << ": "
+ << sasl_errstring(ret, NULL, NULL));
}
return Status::OK();
@@ -496,10 +495,9 @@ MONGO_INITIALIZER_WITH_PREREQUISITES(SaslPlainClientPlugin,
int ret = sasl_client_add_plugin("PLAIN", plain_client_plug_init);
if (SASL_OK != ret) {
return Status(ErrorCodes::UnknownError,
- mongoutils::str::stream() << "Could not add SASL Client PLAIN plugin "
- << sspiPluginName
- << ": "
- << sasl_errstring(ret, NULL, NULL));
+ str::stream() << "Could not add SASL Client PLAIN plugin " << sspiPluginName
+ << ": "
+ << sasl_errstring(ret, NULL, NULL));
}
return Status::OK();
View Lorry Controller Status