Changeset 7681 in vbox

Timestamp:

Apr 1, 2008 1:06:23 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

29203

Message:

added VMMDev config option to keep credentials

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VBoxDev.cpp (modified) (4 diffs)
• VMMDevState.h (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -1436 +1436 @@
                 }
 
-                /* does the caller want us to destroy the logon credentials? */
-                if (credentials->u32Flags & VMMDEV_CREDENTIALS_CLEAR)
-                {
-                    memset(pData->credentialsLogon.szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN);
-                    memset(pData->credentialsLogon.szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN);
-                    memset(pData->credentialsLogon.szDomain, '\0', VMMDEV_CREDENTIALS_STRLEN);
+                if (!pData->fKeepCredentials)
+                {
+                    /* does the caller want us to destroy the logon credentials? */
+                    if (credentials->u32Flags & VMMDEV_CREDENTIALS_CLEAR)
+                    {
+                        memset(pData->credentialsLogon.szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN);
+                        memset(pData->credentialsLogon.szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN);
+                        memset(pData->credentialsLogon.szDomain, '\0', VMMDEV_CREDENTIALS_STRLEN);
+                    }
                 }
 
@@ -2097 +2100 @@
      * Validate and read the configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfgHandle, "GetHostTimeDisabled\0BackdoorLogDisabled\0"))
+    if (!CFGMR3AreValuesValid(pCfgHandle, "GetHostTimeDisabled\0BackdoorLogDisabled\0KeepCredentials\0"))
         return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
 
@@ -2113 +2116 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed querying \"BackdoorLogDisabled\" as a boolean"));
+
+    rc = CFGMR3QueryBool(pCfgHandle, "KeepCredentials", &pData->fKeepCredentials);
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+        pData->fKeepCredentials = false;
+    else if (VBOX_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed querying \"KeepCredentials\" as a boolean"));
 
     /*
@@ -2290 +2300 @@
         vmmdevInitRam(pData);
 
-    /* credentials have to go away */
-    memset(pData->credentialsLogon.szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN);
-    memset(pData->credentialsLogon.szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN);
-    memset(pData->credentialsLogon.szDomain, '\0', VMMDEV_CREDENTIALS_STRLEN);
+    /* credentials have to go away (by default) */
+    if (!pData->fKeepCredentials)
+    {
+        memset(pData->credentialsLogon.szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN);
+        memset(pData->credentialsLogon.szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN);
+        memset(pData->credentialsLogon.szDomain, '\0', VMMDEV_CREDENTIALS_STRLEN);
+    }
     memset(pData->credentialsJudge.szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN);
     memset(pData->credentialsJudge.szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN);

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -157 +157 @@
     bool fBackdoorLogDisabled;
 
+    /** Don't clear credentials */
+    bool fKeepCredentials;
+
 #ifdef VBOX_HGCM
     /** List of pending HGCM requests, used for saving the HGCM state. */