From a03d4f35cdbf4850817b500f9298e2dfc3839fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= <ihuguet@riseup.net>
Date: Tue, 3 Mar 2026 10:12:47 +0100
Subject: [PATCH] fixup! core: device: allow to reset the managed property

---
 .../org.freedesktop.NetworkManager.Device.xml |  2 +-
 src/core/devices/nm-device.c                  | 21 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/introspection/org.freedesktop.NetworkManager.Device.xml b/introspection/org.freedesktop.NetworkManager.Device.xml
index d5b2f48bd6..3b0c2c46b8 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.xml
@@ -396,7 +396,7 @@
 
     <!--
         SetManaged:
-        @managed:(<link linkend="NMDeviceState">NMDeviceManaged</link>) Whether the device is managed. Possible values are "no" (0), "yes" (1) and "reset" (2).
+        @managed:(<link linkend="NMDeviceManaged">NMDeviceManaged</link>) Whether the device is managed. Possible values are "no" (0), "yes" (1) and "reset" (2).
         @flags: (<link linkend="NMDeviceManagedFlags">NMDeviceManagedFlags</link>) flags.
         @since: 1.58
 
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index 08e23ab2fe..217cc6c8d2 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -14962,6 +14962,8 @@ set_managed(NMDevice *self, NMDeviceManaged managed, NMDeviceManagedFlags flags,
     NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
     NMTernary        managed_to_disk, old = NM_TERNARY_DEFAULT;
 
+    nm_assert(
+        NM_IN_SET(managed, NM_DEVICE_MANAGED_NO, NM_DEVICE_MANAGED_YES, NM_DEVICE_MANAGED_RESET));
     nm_assert((flags & ~NM_DEVICE_MANAGED_FLAGS_ALL) == 0);
 
     if (!NM_FLAGS_ANY(flags, NM_DEVICE_MANAGED_FLAGS_PERMANENT | NM_DEVICE_MANAGED_FLAGS_RUNTIME)) {
@@ -15037,11 +15039,20 @@ set_managed_cb(NMDevice              *self,
     flags   = set_managed_data->managed_flags;
     nm_g_slice_free(set_managed_data);
 
-    if (!error && (flags & ~NM_DEVICE_MANAGED_FLAGS_ALL) != 0) {
-        g_set_error_literal(&error,
-                            NM_DEVICE_ERROR,
-                            NM_DEVICE_ERROR_INVALID_ARGUMENT,
-                            "Invalid flags");
+    if (!error) {
+        if (!NM_IN_SET(managed,
+                       NM_DEVICE_MANAGED_NO,
+                       NM_DEVICE_MANAGED_YES,
+                       NM_DEVICE_MANAGED_RESET))
+            g_set_error_literal(&error,
+                                NM_DEVICE_ERROR,
+                                NM_DEVICE_ERROR_INVALID_ARGUMENT,
+                                "Invalid managed value");
+        else if ((flags & ~NM_DEVICE_MANAGED_FLAGS_ALL) != 0)
+            g_set_error_literal(&error,
+                                NM_DEVICE_ERROR,
+                                NM_DEVICE_ERROR_INVALID_ARGUMENT,
+                                "Invalid flags");
     }
 
     if (error) {