Changeset 11998 in vbox for trunk/src/VBox/Main/ConsoleImpl2.cpp

Timestamp:

Sep 2, 2008 5:02:03 PM (16 years ago)

Author:

vboxsync

Message:

Main/vboxnetflt: Accept raw NIC names as well as NIC name + description on Solaris hosts.

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1225 +1225 @@
 
 # elif defined(RT_OS_SOLARIS) 
-                    /* The name is on the form BSD format 'ifX - long name, chop it off at space. */
+                    /* The name is on the form format 'ifX - long name, chop it off at space. */
                     char szTrunk[8];
                     strncpy(szTrunk, pszHifName, sizeof(szTrunk));
                     char *pszSpace = (char *)memchr(szTrunk, ' ', sizeof(szTrunk));
-                    if (!pszSpace)
-                    {
-                        hrc = networkAdapter->Detach();                              H();
-                        return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
-                                          N_("Malformed host interface networking name '%ls'"),
-                                          HifName.raw());
-                    }
-                    *pszSpace = '\0';
+                    
+                    /*
+                     * Currently don't bother about malformed names here for the sake of people using
+                     * VBoxManage and setting only the NIC name from there. If there is a space we
+                     * chop it off and proceed, otherwise just use whatever we've got.
+                     */
+                    if (pszSpace)
+                        *pszSpace = '\0';
                     const char *pszTrunk = szTrunk;
 # else