Imported Upstream version 4.0.6-dfsgupstream/4.0.6-dfsg

1 files changed, 13 insertions, 0 deletions

diff --git a/src/VBox/Main/src-client/ConsoleVRDPServer.cpp b/src/VBox/Main/src-client/ConsoleVRDPServer.cpp
index 97a0d6cef..19c845f1c 100644
--- a/src/VBox/Main/src-client/ConsoleVRDPServer.cpp
+++ b/src/VBox/Main/src-client/ConsoleVRDPServer.cpp
@@ -1668,7 +1668,20 @@ AuthResult ConsoleVRDPServer::Authenticate(const Guid &uuid, AuthGuestJudgement
         if (RTPathHavePath(filename.c_str()))
             rc = RTLdrLoad(filename.c_str(), &mAuthLibrary);
         else
+        {
             rc = RTLdrLoadAppPriv(filename.c_str(), &mAuthLibrary);
+            if (RT_FAILURE(rc))
+            {
+                /* Backward compatibility with old default 'VRDPAuth' name.
+                 * Try to load new default 'VBoxAuth' instead.
+                 */
+                if (filename == "VRDPAuth")
+                {
+                    LogRel(("AUTH: ConsoleVRDPServer::Authenticate: loading external authentication library VBoxAuth\n"));
+                    rc = RTLdrLoadAppPriv("VBoxAuth", &mAuthLibrary);
+                }
+            }
+        }
 
         if (RT_FAILURE(rc))
             LogRel(("AUTH: Failed to load external authentication library. Error code: %Rrc\n", rc));