Changeset 26374 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 9, 2010 2:21:31 PM (15 years ago)

Author:

vboxsync

Message:

VbglR3/VBoxCredProv/pam_vbox: Return value for VbglR3CredentialsAreAvailable().

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxCredProv/VBoxCredPoller.cpp (modified) (1 diff)
• common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredPoller.cpp

@@ -217 +217 @@
     {
         int rc;
-        if (VbglR3CredentialsAreAvailable())
+        rc = VbglR3CredentialsAreAvailable();
+        if (RT_FAILURE(rc))
+        {
+            if (rc == VERR_NOT_FOUND)
+                Log(("VBoxCredPoller::threadPoller: No credentials availabe.\n"));
+            else
+                Log(("VBoxCredPoller::threadPoller: Could not retrieve credentials! rc = %Rc\n", rc));
+        }
+        else
         {
             Log(("VBoxCredPoller::threadPoller: Credentials available.\n"));

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp

@@ -35 +35 @@
  * Checks whether user credentials are available to the guest or not.
  *
- * @returns true if credentials are available, false if not (or error occured).
+ * @returns IPRT status value; VINF_SUCCESS if credentials are available,
+ *          VERR_NOT_FOUND if not. Otherwise an error is occured.
  */
-VBGLR3DECL(bool) VbglR3CredentialsAreAvailable(void)
+VBGLR3DECL(int) VbglR3CredentialsAreAvailable(void)
 {
     VMMDevCredentials Req;
@@ -45 +46 @@
 
     int rc = vbglR3GRPerform(&Req.header);
-    return RT_SUCCESS(rc)
-        && (Req.u32Flags & VMMDEV_CREDENTIALS_PRESENT) != 0;
+    if (RT_SUCCESS(rc))
+    {
+        if ((Req.u32Flags & VMMDEV_CREDENTIALS_PRESENT) == 0)
+            rc = VERR_NOT_FOUND;
+    }
+    return rc;
 }