Changeset 36703 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Apr 18, 2011 11:06:52 AM (14 years ago)

Author:

vboxsync

Message:

Main/Networking: Made configNetwork less picky about adapter names on Darwin (#5633)

File:

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

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -3775 +3775 @@
                 RTStrCopy(szTrunk, sizeof(szTrunk), pszHifName);
                 char *pszColon = (char *)memchr(szTrunk, ':', sizeof(szTrunk));
-                if (!pszColon)
-                {
-                    /*
-                    * Dynamic changing of attachment causes an attempt to configure
-                    * network with invalid host adapter (as it is must be changed before
-                    * the attachment), calling Detach here will cause a deadlock.
-                    * See #4750.
-                    * hrc = aNetworkAdapter->Detach();                        H();
-                    */
-                    return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
-                                      N_("Malformed host interface networking name '%ls'"),
-                                      HifName.raw());
-                }
-                *pszColon = '\0';
+// Quick fix for #5633
+//                 if (!pszColon)
+//                 {
+//                     /*
+//                     * Dynamic changing of attachment causes an attempt to configure
+//                     * network with invalid host adapter (as it is must be changed before
+//                     * the attachment), calling Detach here will cause a deadlock.
+//                     * See #4750.
+//                     * hrc = aNetworkAdapter->Detach();                        H();
+//                     */
+//                     return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
+//                                       N_("Malformed host interface networking name '%ls'"),
+//                                       HifName.raw());
+//                 }
+                if (pszColon)
+                    *pszColon = '\0';
                 const char *pszTrunk = szTrunk;