vbox的更動 63197 路徑 trunk/src/VBox/HostServices

時間撮記:

2016-8-9 上午09:14:21 (8 年 以前)

作者:

vboxsync

訊息:

VBoxAuthSimple: Fixed warnings and some silly code.

檔案:

• trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.cpp (修改) (4 筆差異)

trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.cpp

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * VirtualBox External Authentication Library:
- * Simple Authentication.
+ * VirtualBox External Authentication Library - Simple Authentication.
  */
 
@@ -38 +37 @@
 
 
-static void dprintf(const char *fmt, ...)
+static void dprintf(const char *pszFormat, ...)
 {
 #ifdef AUTH_DEBUG_FILE_NAME
-    va_list va;
-
-    va_start(va, fmt);
-
-    char buffer[1024];
-
-    vsnprintf(buffer, sizeof(buffer), fmt, va);
-
     FILE *f = fopen(AUTH_DEBUG_FILE_NAME, "ab");
     if (f)
     {
-        fprintf(f, "%s", buffer);
+        va_list va;
+        va_start(va, pszFormat);
+        vfprintf(f, pszFormat, va);
+        va_end(va);
         fclose(f);
     }
-
-    va_end (va);
+#else
+    RT_NOREF(pszFormat);
 #endif
 }
 
 RT_C_DECLS_BEGIN
-DECLEXPORT(AuthResult) AUTHCALL AuthEntry(const char *szCaller,
+DECLEXPORT(FNAUTHENTRY3) AuthEntry;
+RT_C_DECLS_END
+
+DECLEXPORT(AuthResult) AUTHCALL AuthEntry(const char *pszCaller,
                                           PAUTHUUID pUuid,
                                           AuthGuestJudgement guestJudgement,
-                                          const char *szUser,
-                                          const char *szPassword,
-                                          const char *szDomain,
+                                          const char *pszUser,
+                                          const char *pszPassword,
+                                          const char *pszDomain,
                                           int fLogon,
                                           unsigned clientId)
 {
+    RT_NOREF(pszCaller, guestJudgement, pszDomain, clientId);
+
     /* default is failed */
     AuthResult result = AuthResultAccessDenied;
@@ -83 +82 @@
 
     /* the user might contain a domain name, split it */
-    char *user = strchr((char*)szUser, '\\');
+    const char *user = strchr(pszUser, '\\');
     if (user)
         user++;
     else
-        user = (char*)szUser;
+        user = (char*)pszUser;
 
-    dprintf("VBoxAuth: uuid: %s, user: %s, szPassword: %s\n", uuid, user, szPassword);
+    dprintf("VBoxAuth: uuid: %s, user: %s, pszPassword: %s\n", uuid, user, pszPassword);
 
     ComPtr<IVirtualBoxClient> virtualBoxClient;
@@ -97 +96 @@
     rc = virtualBoxClient.createInprocObject(CLSID_VirtualBoxClient);
     if (SUCCEEDED(rc))
+    {
         rc = virtualBoxClient->COMGETTER(VirtualBox)(virtualBox.asOutParam());
-    if (SUCCEEDED(rc))
-    {
-        Bstr key = BstrFmt("VBoxAuthSimple/users/%s", user);
-        Bstr password;
+        if (SUCCEEDED(rc))
+        {
+            Bstr key = BstrFmt("VBoxAuthSimple/users/%s", user);
+            Bstr password;
 
-        /* lookup in VM's extra data? */
-        if (pUuid)
-        {
-            ComPtr<IMachine> machine;
-            virtualBox->FindMachine(Bstr(uuid).raw(), machine.asOutParam());
-            if (machine)
-                machine->GetExtraData(key.raw(), password.asOutParam());
-        } else
-            /* lookup global extra data */
-            virtualBox->GetExtraData(key.raw(), password.asOutParam());
+            /* lookup in VM's extra data? */
+            if (pUuid)
+            {
+                ComPtr<IMachine> machine;
+                virtualBox->FindMachine(Bstr(uuid).raw(), machine.asOutParam());
+                if (machine)
+                    machine->GetExtraData(key.raw(), password.asOutParam());
+            }
+            else
+                /* lookup global extra data */
+                virtualBox->GetExtraData(key.raw(), password.asOutParam());
 
-        if (!password.isEmpty())
-        {
-            /* calculate hash */
-            uint8_t abDigest[RTSHA256_HASH_SIZE];
-            RTSha256(szPassword, strlen(szPassword), abDigest);
-            char pszDigest[RTSHA256_DIGEST_LEN + 1];
-            RTSha256ToString(abDigest, pszDigest, sizeof(pszDigest));
+            if (!password.isEmpty())
+            {
+                /* calculate hash */
+                uint8_t abDigest[RTSHA256_HASH_SIZE];
+                RTSha256(pszPassword, strlen(pszPassword), abDigest);
+                char pszDigest[RTSHA256_DIGEST_LEN + 1];
+                RTSha256ToString(abDigest, pszDigest, sizeof(pszDigest));
 
-            if (password == pszDigest)
-                result = AuthResultAccessGranted;
+                if (password == pszDigest)
+                    result = AuthResultAccessGranted;
+            }
         }
+        else
+            dprintf("VBoxAuth: failed to get VirtualBox object reference: %#x\n", rc);
     }
     else
-        dprintf("VBoxAuth: failed to get VirtualBox object reference: %Rhrc\n", rc);
+        dprintf("VBoxAuth: failed to get VirtualBoxClient object reference: %#x\n", rc);
 
     return result;
 }
-RT_C_DECLS_END
 
-/* Verify the function prototype. */
-static PAUTHENTRY3 gpfnAuthEntry = AuthEntry;