Changeset 36961 in vbox for trunk/src/VBox/Main

Timestamp:

May 4, 2011 4:37:48 PM (14 years ago)

Author:

vboxsync

Message:

Main/USB/linux: return correct error codes and messages if the user does not have the right access permissions

Location:

trunk/src/VBox/Main/src-server

Files:

• HostImpl.cpp (modified) (1 diff)
• linux/USBProxyServiceLinux.cpp (modified) (1 diff)

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

@@ -2736 +2736 @@
          * USB proxy service could not start. */
 
-        if (m->pUSBProxyService->getLastError() == VERR_FILE_NOT_FOUND)
-            return setWarning(E_FAIL,
-                              tr("Could not load the Host USB Proxy Service (%Rrc). The service might not be installed on the host computer"),
-                              m->pUSBProxyService->getLastError());
-        if (m->pUSBProxyService->getLastError() == VINF_SUCCESS)
-#ifdef RT_OS_LINUX
-            return setWarning (VBOX_E_HOST_ERROR,
-# ifdef VBOX_WITH_DBUS
-                tr ("The USB Proxy Service could not be started, because neither the USB file system (usbfs) nor the hardware information service (hal) is available")
-# else
-                tr ("The USB Proxy Service could not be started, because the USB file system (usbfs) is not available")
-# endif
-                );
-#else  /* !RT_OS_LINUX */
-            return setWarning (E_FAIL,
-                tr ("The USB Proxy Service has not yet been ported to this host"));
-#endif /* !RT_OS_LINUX */
-        return setWarning (E_FAIL,
-            tr ("Could not load the Host USB Proxy service (%Rrc)"),
-            m->pUSBProxyService->getLastError());
+        switch (m->pUSBProxyService->getLastError())
+        {
+            case VERR_FILE_NOT_FOUND:  /** @todo what does this mean? */
+                return setWarning(E_FAIL,
+                                  tr("Could not load the Host USB Proxy Service (VERR_FILE_NOT_FOUND). The service might not be installed on the host computer"));
+            case VERR_VUSB_USB_DEVICE_PERMISSION:
+                return setWarning(E_FAIL,
+                                  tr("VirtualBox is not currently allowed to access USB devices.  You can change this by adding your user to the 'vboxusers' group.  Please see the user manual for a more detailed explanation"));
+            case VERR_VUSB_USBFS_PERMISSION:
+                return setWarning(E_FAIL,
+                                  tr("VirtualBox is not currently allowed to access USB devices.  You can change this by allowing your user to access the 'usbfs' folder and files.  Please see the user manual for a more detailed explanation"));
+            case VINF_SUCCESS:
+                return setWarning(E_FAIL,
+                                  tr("The USB Proxy Service has not yet been ported to this host"));
+            default:
+                return setWarning (E_FAIL, "%s: %Rrc",
+                                   tr ("Could not load the Host USB Proxy service"),
+                                   m->pUSBProxyService->getLastError());
+        }
     }
 

trunk/src/VBox/Main/src-server/linux/USBProxyServiceLinux.cpp

@@ -142 +142 @@
     else
         /** @todo fix this, preferably in the next fifteen minutes. */
-        mLastError =   RTDirExists("/dev/vboxusb") ? VERR_PERMISSION_DENIED
+        mLastError =   RTDirExists("/dev/vboxusb") ? VERR_VUSB_USB_DEVICE_PERMISSION
                      : RTFileExists("/proc/bus/usb/devices") ? VERR_VUSB_USBFS_PERMISSION
                      : VERR_NOT_FOUND;