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

[gd at samba.org]

Author: gd
Date: 2007-05-11 13:37:51 +0000 (Fri, 11 May 2007)
New Revision: 22801

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

Log:
Pass down the token to add_gplink_to_gpo_list().

Guenther

Modified:
   branches/SAMBA_3_0/source/libgpo/gpo_ldap.c
   branches/SAMBA_3_0_26/source/libgpo/gpo_ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/libgpo/gpo_ldap.c
===================================================================
--- branches/SAMBA_3_0/source/libgpo/gpo_ldap.c	2007-05-11 13:33:37 UTC (rev 22800)
+++ branches/SAMBA_3_0/source/libgpo/gpo_ldap.c	2007-05-11 13:37:51 UTC (rev 22801)
@@ -524,7 +524,8 @@
 				  const char *link_dn,
 				  struct GP_LINK *gp_link,
 				  enum GPO_LINK_TYPE link_type,
-				  BOOL only_add_forced_gpos)
+				  BOOL only_add_forced_gpos,
+				  struct GPO_SID_TOKEN *token)
 {
 	ADS_STATUS status;
 	int i;
@@ -646,6 +647,7 @@
 	
 	ADS_STATUS status;
 	struct GP_LINK gp_link;
+	struct GPO_SID_TOKEN *token = NULL;
 	const char *parent_dn, *site_dn, *tmp_dn;
 	BOOL add_only_forced_gpos = False;
 
@@ -653,6 +655,11 @@
 
 	DEBUG(10,("ads_get_gpo_list: getting GPO list for [%s]\n", dn));
 
+	status = ads_get_gpo_sid_token(ads, mem_ctx, dn, &token);
+	if (!ADS_ERR_OK(status)) {
+		return status;
+	}
+
 	/* (L)ocal */
 	/* not yet... */
 	
@@ -677,7 +684,8 @@
 			
 			status = add_gplink_to_gpo_list(ads, mem_ctx, gpo_list, 
 							site_dn, &gp_link, GP_LINK_SITE, 
-							add_only_forced_gpos);
+							add_only_forced_gpos,
+							token);
 			if (!ADS_ERR_OK(status)) {
 				return status;
 			}
@@ -717,7 +725,8 @@
 				status = add_gplink_to_gpo_list(ads, mem_ctx, 
 								gpo_list, parent_dn, 
 								&gp_link, GP_LINK_DOMAIN, 
-								add_only_forced_gpos);
+								add_only_forced_gpos,
+								token);
 				if (!ADS_ERR_OK(status)) {
 					return status;
 				}
@@ -756,7 +765,8 @@
 				status = add_gplink_to_gpo_list(ads, mem_ctx, 
 								gpo_list, parent_dn, 
 								&gp_link, GP_LINK_OU, 
-								add_only_forced_gpos);
+								add_only_forced_gpos,
+								token);
 				if (!ADS_ERR_OK(status)) {
 					return status;
 				}

Modified: branches/SAMBA_3_0_26/source/libgpo/gpo_ldap.c
===================================================================
--- branches/SAMBA_3_0_26/source/libgpo/gpo_ldap.c	2007-05-11 13:33:37 UTC (rev 22800)
+++ branches/SAMBA_3_0_26/source/libgpo/gpo_ldap.c	2007-05-11 13:37:51 UTC (rev 22801)
@@ -524,7 +524,8 @@
 				  const char *link_dn,
 				  struct GP_LINK *gp_link,
 				  enum GPO_LINK_TYPE link_type,
-				  BOOL only_add_forced_gpos)
+				  BOOL only_add_forced_gpos,
+				  struct GPO_SID_TOKEN *token)
 {
 	ADS_STATUS status;
 	int i;
@@ -646,6 +647,7 @@
 	
 	ADS_STATUS status;
 	struct GP_LINK gp_link;
+	struct GPO_SID_TOKEN *token = NULL;
 	const char *parent_dn, *site_dn, *tmp_dn;
 	BOOL add_only_forced_gpos = False;
 
@@ -653,6 +655,11 @@
 
 	DEBUG(10,("ads_get_gpo_list: getting GPO list for [%s]\n", dn));
 
+	status = ads_get_gpo_sid_token(ads, mem_ctx, dn, &token);
+	if (!ADS_ERR_OK(status)) {
+		return status;
+	}
+
 	/* (L)ocal */
 	/* not yet... */
 	
@@ -677,7 +684,8 @@
 			
 			status = add_gplink_to_gpo_list(ads, mem_ctx, gpo_list, 
 							site_dn, &gp_link, GP_LINK_SITE, 
-							add_only_forced_gpos);
+							add_only_forced_gpos,
+							token);
 			if (!ADS_ERR_OK(status)) {
 				return status;
 			}
@@ -717,7 +725,8 @@
 				status = add_gplink_to_gpo_list(ads, mem_ctx, 
 								gpo_list, parent_dn, 
 								&gp_link, GP_LINK_DOMAIN, 
-								add_only_forced_gpos);
+								add_only_forced_gpos,
+								token);
 				if (!ADS_ERR_OK(status)) {
 					return status;
 				}
@@ -756,7 +765,8 @@
 				status = add_gplink_to_gpo_list(ads, mem_ctx, 
 								gpo_list, parent_dn, 
 								&gp_link, GP_LINK_OU, 
-								add_only_forced_gpos);
+								add_only_forced_gpos,
+								token);
 				if (!ADS_ERR_OK(status)) {
 					return status;
 				}