Changeset 72482 in vbox

Timestamp:

Jun 8, 2018 1:29:34 PM (6 years ago)

Author:

vboxsync

Message:

Main/NetworkAdapter: allow arbitrary network names for disabled adapters

File:

• trunk/src/VBox/Main/src-server/NetworkAdapterImpl.cpp (modified) (4 diffs)

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

@@ -513 +513 @@
         /* if an empty/null string is to be set, bridged interface must be
          * turned off */
-        if (canonicalName.isEmpty()
+        if (   canonicalName.isEmpty()
+            && mData->fEnabled
             && mData->mode == NetworkAttachmentType_Bridged)
         {
@@ -560 +561 @@
         /* if an empty/null string is to be set, host only interface must be
          * turned off */
-        if ( aHostOnlyInterface.isEmpty()
-             && mData->mode == NetworkAttachmentType_HostOnly)
+        if (   aHostOnlyInterface.isEmpty()
+            && mData->fEnabled
+            && mData->mode == NetworkAttachmentType_HostOnly)
         {
             return setError(E_FAIL,
@@ -608 +610 @@
         /* if an empty/null string is to be set, internal networking must be
          * turned off */
-        if (aInternalNetwork.isEmpty() && mData->mode == NetworkAttachmentType_Internal)
+        if (   aInternalNetwork.isEmpty()
+            && mData->fEnabled
+            && mData->mode == NetworkAttachmentType_Internal)
         {
             return setError(E_FAIL,
@@ -654 +658 @@
         /* if an empty/null string is to be set, host only interface must be
          * turned off */
-        if (aNATNetwork.isEmpty()
+        if (   aNATNetwork.isEmpty()
+            && mData->fEnabled
             && mData->mode == NetworkAttachmentType_NATNetwork)
             return setError(E_FAIL,