r25325: Rename some defines.

Guenther
(This used to be commit cc38e4fc1f2d3f9e2e2ff90a7a004ce8fdfa9238)

diff --git a/source3/include/gpo.h b/source3/include/gpo.h
index 6ca159149fe113b381083ca467e7b8676669bcb2..9b1a672640852bfde7242cf54a361cb4723d511f 100644 (file)
--- a/source3/include/gpo.h
+++ b/source3/include/gpo.h
@@ -93,6 +93,6 @@ struct GP_EXT {
 #define GPO_CACHE_DIR "gpo_cache"
 #define GPT_INI "GPT.INI"
 
-#define GP_EXT_SECURITY "827D319E-6EAC-11D2-A4EA-00C04F79F83A"
-#define GP_EXT_REGISTRY "35378EAC-683F-11D2-A89A-00C04FBBCFA2"
-#define GP_EXT_SCRIPTS  "42B5FAAE-6536-11D2-AE5A-0000F87571E3"
+#define GP_EXT_GUID_SECURITY "827D319E-6EAC-11D2-A4EA-00C04F79F83A"
+#define GP_EXT_GUID_REGISTRY "35378EAC-683F-11D2-A89A-00C04FBBCFA2"
+#define GP_EXT_GUID_SCRIPTS  "42B5FAAE-6536-11D2-AE5A-0000F87571E3"

diff --git a/source3/libgpo/gpo_util.c b/source3/libgpo/gpo_util.c
index fa964e8e2cbd1aafadcbe13253ec8f08d9b2a456..126b44cc978b41613feb556a17f418e4ed74604b 100644 (file)
--- a/source3/libgpo/gpo_util.c
+++ b/source3/libgpo/gpo_util.c
@@ -45,7 +45,7 @@ static struct gp_table gpo_cse_extensions[] = {
        /* "Registry Settings"
        (http://support.microsoft.com/kb/216357/EN-US/) */
        { "Registry Settings",
-               GP_EXT_REGISTRY },
+               GP_EXT_GUID_REGISTRY },
        { "Microsoft Disc Quota",
                "3610EDA5-77EF-11D2-8DC5-00C04FA31A66" },
        { "EFS recovery",
@@ -59,9 +59,9 @@ static struct gp_table gpo_cse_extensions[] = {
        { "QoS Packet Scheduler",
                "426031c0-0b47-4852-b0ca-ac3d37bfcb39" },
        { "Scripts",
-               GP_EXT_SCRIPTS },
+               GP_EXT_GUID_SCRIPTS },
        { "Security",
-               GP_EXT_SECURITY },
+               GP_EXT_GUID_SECURITY },
        { "Software Installation",
                "C6DC5466-785A-11D2-84D0-00C04FB169F7" },
        { "Wireless Group Policy",