From: David Mulder <dmulder@samba.org>
Date: Tue, 25 Oct 2022 14:28:22 +0000 (-0600)
Subject: gpo: GPME doesn't permit nesting of admx categories in builtin
X-Git-Tag: talloc-2.4.0~588
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=635b1adfc5c8525634cfbc3f4d64fb9efa1c6f09;p=thirdparty%2Fsamba.git

gpo: GPME doesn't permit nesting of admx categories in builtin

The gnome settings were nested within a builtin
admx category, which GPME does not permit. This
was hiding the GNOME settings anytime windows
admx templates were present.

Signed-off-by: David Mulder <dmulder@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Nov  4 19:09:09 UTC 2022 on sn-devel-184
---

diff --git a/libgpo/admx/GNOME_Settings.admx b/libgpo/admx/GNOME_Settings.admx
index 6e506b1377f..202960b2c34 100644
--- a/libgpo/admx/GNOME_Settings.admx
+++ b/libgpo/admx/GNOME_Settings.admx
@@ -10,9 +10,7 @@
     </definitions>
   </supportedOn>
   <categories>
-    <category name="CAT_351B0FDF_55F3_4904_AC71_D3A6CF8DB323" displayName="$(string.CAT_351B0FDF_55F3_4904_AC71_D3A6CF8DB323)">
-      <parentCategory ref="windows:ControlPanel" />
-    </category>
+    <category name="CAT_351B0FDF_55F3_4904_AC71_D3A6CF8DB323" displayName="$(string.CAT_351B0FDF_55F3_4904_AC71_D3A6CF8DB323)" />
     <category name="CAT_7E067B4B_2FE1_4AAD_8D76_54209466A491" displayName="$(string.CAT_7E067B4B_2FE1_4AAD_8D76_54209466A491)">
       <parentCategory ref="CAT_351B0FDF_55F3_4904_AC71_D3A6CF8DB323" />
     </category>