SERVER-32617 Fix code that reconstructs status with just code and string

1 files changed, 3 insertions, 9 deletions

diff --git a/src/mongo/client/sasl_client_authenticate_impl.cpp b/src/mongo/client/sasl_client_authenticate_impl.cpp
index d4755a22775..8ea87b55794 100644
--- a/src/mongo/client/sasl_client_authenticate_impl.cpp
+++ b/src/mongo/client/sasl_client_authenticate_impl.cpp
@@ -212,15 +212,9 @@ void asyncSaslConversation(auth::RunCommandHook runCommand,
             }
 
             auto serverResponse = response.data.getOwned();
-            auto code = getStatusFromCommandResult(serverResponse).code();
-
-            // Server versions 2.3.2 and earlier may return "ok: 1" with a non-zero
-            // "code" field, indicating a failure.  Subsequent versions should
-            // return "ok: 0" on failure with a non-zero "code" field to indicate specific
-            // failure. In all versions, either (ok: 1, code: > 0) or (ok: 0, code optional)
-            // indicate failure.
-            if (code != ErrorCodes::OK) {
-                return handler({code, serverResponse[saslCommandErrmsgFieldName].str()});
+            auto status = getStatusFromCommandResult(serverResponse);
+            if (!status.isOK()) {
+                return handler(status);
             }
 
             // Exit if we have finished