From bb12f19e4fe100029c32bdab92aa6515be7e71f6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kacper=20Bostr=C3=B6m?= Date: Tue, 10 Sep 2024 18:40:24 +0200 Subject: [PATCH] samba-tool: Fix for inability to delete GPOs containing GPWL policies MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit GPOs containing GPWL (Wireless/Wired Protocol Extension) policies could not be deleted with samba-tool as those policies were stored as subentries of the GPO and only the main root was deleted. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15387 RN: Fix for inability to delete GPOs containing GPWL policies using samba-tool Signed-off-by: Kacper Boström Reviewed-by: David Mulder Reviewed-by: Andreas Schneider Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Tue Sep 24 17:11:53 UTC 2024 on atb-devel-224 --- python/samba/netcmd/gpo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py index ba55b2ec7a7..96fce917f0f 100644 --- a/python/samba/netcmd/gpo.py +++ b/python/samba/netcmd/gpo.py @@ -1770,8 +1770,8 @@ class cmd_del(GPOCommand): # Remove LDAP entries gpo_dn = get_gpo_dn(self.samdb, gpo) - self.samdb.delete(ldb.Dn(self.samdb, "CN=User,%s" % str(gpo_dn))) - self.samdb.delete(ldb.Dn(self.samdb, "CN=Machine,%s" % str(gpo_dn))) + self.samdb.delete(ldb.Dn(self.samdb, "CN=User,%s" % str(gpo_dn)), ["tree_delete:1"]) + self.samdb.delete(ldb.Dn(self.samdb, "CN=Machine,%s" % str(gpo_dn)), ["tree_delete:1"]) self.samdb.delete(gpo_dn) # Remove GPO files -- 2.47.2