Changeset 59130 in vbox for trunk/src/VBox

Timestamp:

Dec 15, 2015 11:44:05 AM (9 years ago)

Author:

vboxsync

Message:

Main: release the machine lock when calling the external auth library.

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -13600 +13600 @@
     HRESULT hr = S_OK;
 
+    if (!mAuthLibCtx.hAuthLibrary)
+    {
+        /* Load the external authentication library. */
+        Bstr authLibrary;
+        mVRDEServer->COMGETTER(AuthLibrary)(authLibrary.asOutParam());
+
+        Utf8Str filename = authLibrary;
+
+        int rc = AuthLibLoad(&mAuthLibCtx, filename.c_str());
+        if (RT_FAILURE(rc))
+        {
+            hr = setError(E_FAIL,
+                          tr("Could not load the external authentication library '%s' (%Rrc)"),
+                          filename.c_str(), rc);
+        }
+    }
+
+    /* The auth library might need the machine lock. */
+    alock.release();
+
+    if (FAILED(hr))
+       return hr;
+
     if (aAuthParams[0] == "VRDEAUTH" && aAuthParams.size() == 7)
     {
@@ -13614 +13637 @@
         AuthResult result = AuthResultAccessDenied;
 
-        if (!mAuthLibCtx.hAuthLibrary)
-        {
-            /* Load the external authentication library. */
-            Bstr authLibrary;
-            mVRDEServer->COMGETTER(AuthLibrary)(authLibrary.asOutParam());
-
-            Utf8Str filename = authLibrary;
-
-            int rc = AuthLibLoad(&mAuthLibCtx, filename.c_str());
-            if (RT_FAILURE(rc))
-            {
-                hr = setError(E_FAIL,
-                              tr("Could not load the external authentication library '%s' (%Rrc)"),
-                              filename.c_str(), rc);
-            }
-        }
-
-        if (SUCCEEDED(hr))
-        {
-            Guid uuid(aAuthParams[parmUuid]);
-            AuthGuestJudgement guestJudgement = (AuthGuestJudgement)aAuthParams[parmGuestJudgement].toUInt32();
-            uint32_t u32ClientId = aAuthParams[parmClientId].toUInt32();
-
-            result = AuthLibAuthenticate(&mAuthLibCtx,
-                                         uuid.raw(), guestJudgement,
-                                         aAuthParams[parmUser].c_str(),
-                                         aAuthParams[parmPassword].c_str(),
-                                         aAuthParams[parmDomain].c_str(),
-                                         u32ClientId);
-        }
+        Guid uuid(aAuthParams[parmUuid]);
+        AuthGuestJudgement guestJudgement = (AuthGuestJudgement)aAuthParams[parmGuestJudgement].toUInt32();
+        uint32_t u32ClientId = aAuthParams[parmClientId].toUInt32();
+
+        result = AuthLibAuthenticate(&mAuthLibCtx,
+                                     uuid.raw(), guestJudgement,
+                                     aAuthParams[parmUser].c_str(),
+                                     aAuthParams[parmPassword].c_str(),
+                                     aAuthParams[parmDomain].c_str(),
+                                     u32ClientId);
 
         /* Hack: aAuthParams[parmPassword] is const but the code believes in writable memory. */