summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2007-05-11 13:37:51 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:21:59 -0500
commitaec3df5ce810270f703ba0dd17e02409734102d8 (patch)
tree8debd8225ea6ba5d49d651ee92c9d19a5302fac9 /source3
parent83564b43e3b8194b89e0fb8547a968e4f2ff022b (diff)
downloadsamba-aec3df5ce810270f703ba0dd17e02409734102d8.tar.gz
samba-aec3df5ce810270f703ba0dd17e02409734102d8.tar.bz2
samba-aec3df5ce810270f703ba0dd17e02409734102d8.zip
r22801: Pass down the token to add_gplink_to_gpo_list().
Guenther (This used to be commit 2c2e212bc592b387e23f5b058c72b0ccadda6748)
Diffstat (limited to 'source3')
-rw-r--r--source3/libgpo/gpo_ldap.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/source3/libgpo/gpo_ldap.c b/source3/libgpo/gpo_ldap.c
index f82924e415..fbed60b11d 100644
--- a/source3/libgpo/gpo_ldap.c
+++ b/source3/libgpo/gpo_ldap.c
@@ -524,7 +524,8 @@ ADS_STATUS add_gplink_to_gpo_list(ADS_STRUCT *ads,
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 ads_get_gpo_list(ADS_STRUCT *ads,
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 @@ ADS_STATUS ads_get_gpo_list(ADS_STRUCT *ads,
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 @@ ADS_STATUS ads_get_gpo_list(ADS_STRUCT *ads,
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 @@ ADS_STATUS ads_get_gpo_list(ADS_STRUCT *ads,
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 @@ ADS_STATUS ads_get_gpo_list(ADS_STRUCT *ads,
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;
}