svn commit: samba r22796 - in branches: SAMBA_3_0/source/include SAMBA_3_0/source/libgpo SAMBA_3_0_26/source/include SAMBA_3_0_26/source/libgpo

[gd at samba.org]

Author: gd
Date: 2007-05-11 12:41:11 +0000 (Fri, 11 May 2007)
New Revision: 22796

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22796

Log:
Add security descriptor to GROUP_POLICY_OBJECT structure (in preparation of
adding GPO security filtering for libgpo).

Guenther

Modified:
   branches/SAMBA_3_0/source/include/gpo.h
   branches/SAMBA_3_0/source/include/includes.h
   branches/SAMBA_3_0/source/libgpo/gpo_ldap.c
   branches/SAMBA_3_0_26/source/include/gpo.h
   branches/SAMBA_3_0_26/source/include/includes.h
   branches/SAMBA_3_0_26/source/libgpo/gpo_ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/gpo.h
===================================================================
--- branches/SAMBA_3_0/source/include/gpo.h	2007-05-11 12:02:33 UTC (rev 22795)
+++ branches/SAMBA_3_0/source/include/gpo.h	2007-05-11 12:41:11 UTC (rev 22796)
@@ -49,6 +49,7 @@
 	uint32 link_type; /* GPO_LINK_TYPE */
 	const char *user_extensions;
 	const char *machine_extensions;
+	SEC_DESC *security_descriptor;
 	struct GROUP_POLICY_OBJECT *next, *prev;
 };
 

Modified: branches/SAMBA_3_0/source/include/includes.h
===================================================================
--- branches/SAMBA_3_0/source/include/includes.h	2007-05-11 12:02:33 UTC (rev 22795)
+++ branches/SAMBA_3_0/source/include/includes.h	2007-05-11 12:41:11 UTC (rev 22796)
@@ -643,7 +643,6 @@
 
 #include "nt_status.h"
 #include "ads.h"
-#include "gpo.h"
 #include "ads_dns.h"
 #include "interfaces.h"
 #include "trans2.h"
@@ -668,6 +667,7 @@
 #include "mapping.h"
 #include "passdb.h"
 #include "rpc_secdes.h"
+#include "gpo.h"
 #include "authdata.h"
 #include "msdfs.h"
 #include "rap.h"

Modified: branches/SAMBA_3_0/source/libgpo/gpo_ldap.c
===================================================================
--- branches/SAMBA_3_0/source/libgpo/gpo_ldap.c	2007-05-11 12:02:33 UTC (rev 22795)
+++ branches/SAMBA_3_0/source/libgpo/gpo_ldap.c	2007-05-11 12:41:11 UTC (rev 22796)
@@ -434,6 +434,9 @@
 	gpo->machine_extensions = ads_pull_string(ads, mem_ctx, res, "gPCMachineExtensionNames");
 	gpo->user_extensions = ads_pull_string(ads, mem_ctx, res, "gPCUserExtensionNames");
 
+	ads_pull_sd(ads, mem_ctx, res, "ntSecurityDescriptor", &gpo->security_descriptor);
+	ADS_ERROR_HAVE_NO_MEMORY(gpo->security_descriptor);
+
 	return ADS_ERROR(LDAP_SUCCESS);
 }
 
@@ -455,7 +458,7 @@
 	const char *attrs[] = { "cn", "displayName", "flags", "gPCFileSysPath", 
 				"gPCFunctionalityVersion", "gPCMachineExtensionNames", 
 				"gPCUserExtensionNames", "gPCWQLFilter", "name", 
-				"versionNumber", NULL};
+				"versionNumber", "ntSecurityDescriptor", NULL};
 
 	ZERO_STRUCTP(gpo);
 

Modified: branches/SAMBA_3_0_26/source/include/gpo.h
===================================================================
--- branches/SAMBA_3_0_26/source/include/gpo.h	2007-05-11 12:02:33 UTC (rev 22795)
+++ branches/SAMBA_3_0_26/source/include/gpo.h	2007-05-11 12:41:11 UTC (rev 22796)
@@ -49,6 +49,7 @@
 	uint32 link_type; /* GPO_LINK_TYPE */
 	const char *user_extensions;
 	const char *machine_extensions;
+	SEC_DESC *security_descriptor;
 	struct GROUP_POLICY_OBJECT *next, *prev;
 };
 

Modified: branches/SAMBA_3_0_26/source/include/includes.h
===================================================================
--- branches/SAMBA_3_0_26/source/include/includes.h	2007-05-11 12:02:33 UTC (rev 22795)
+++ branches/SAMBA_3_0_26/source/include/includes.h	2007-05-11 12:41:11 UTC (rev 22796)
@@ -644,7 +644,6 @@
 
 #include "nt_status.h"
 #include "ads.h"
-#include "gpo.h"
 #include "ads_dns.h"
 #include "interfaces.h"
 #include "trans2.h"
@@ -669,6 +668,7 @@
 #include "mapping.h"
 #include "passdb.h"
 #include "rpc_secdes.h"
+#include "gpo.h"
 #include "authdata.h"
 #include "msdfs.h"
 #include "rap.h"

Modified: branches/SAMBA_3_0_26/source/libgpo/gpo_ldap.c
===================================================================
--- branches/SAMBA_3_0_26/source/libgpo/gpo_ldap.c	2007-05-11 12:02:33 UTC (rev 22795)
+++ branches/SAMBA_3_0_26/source/libgpo/gpo_ldap.c	2007-05-11 12:41:11 UTC (rev 22796)
@@ -434,6 +434,9 @@
 	gpo->machine_extensions = ads_pull_string(ads, mem_ctx, res, "gPCMachineExtensionNames");
 	gpo->user_extensions = ads_pull_string(ads, mem_ctx, res, "gPCUserExtensionNames");
 
+	ads_pull_sd(ads, mem_ctx, res, "ntSecurityDescriptor", &gpo->security_descriptor);
+	ADS_ERROR_HAVE_NO_MEMORY(gpo->security_descriptor);
+
 	return ADS_ERROR(LDAP_SUCCESS);
 }
 
@@ -455,7 +458,7 @@
 	const char *attrs[] = { "cn", "displayName", "flags", "gPCFileSysPath", 
 				"gPCFunctionalityVersion", "gPCMachineExtensionNames", 
 				"gPCUserExtensionNames", "gPCWQLFilter", "name", 
-				"versionNumber", NULL};
+				"versionNumber", "ntSecurityDescriptor", NULL};
 
 	ZERO_STRUCTP(gpo);