summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorWilco Baan Hofman <wilco@baanhofman.nl>2009-03-15 20:34:59 +0100
committerGünther Deschner <gd@samba.org>2009-04-20 23:16:17 +0200
commit3e010e3eb8f463cb49e5dbace4abc34a067d08f4 (patch)
treefd41f489d2e889f6690c25fb235d7b8a9d57d0fb /source3
parentb939638dc79daa065c58755abf9f58d1df571401 (diff)
downloadsamba-3e010e3eb8f463cb49e5dbace4abc34a067d08f4.tar.gz
samba-3e010e3eb8f463cb49e5dbace4abc34a067d08f4.tar.bz2
samba-3e010e3eb8f463cb49e5dbace4abc34a067d08f4.zip
Adjust samba 3 to the new gpo API. Still untested code.
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/utils/net_ads_gpo.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 97ef917657..ccb5a6e6fa 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -411,7 +411,7 @@ LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ)
GPEXT_OBJ = ../libgpo/gpext/gpext.o @GPEXT_STATIC@
-LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o ../libgpo/gpo_util.o \
+LIBGPO_OBJ0 = ../libgpo/gpo_ldap.o libgpo/gpo_ini.o ../libgpo/gpo_util.o \
../libgpo/gpo_fetch.o libgpo/gpo_filesync.o ../libgpo/gpo_sec.o \
libgpo/gpo_reg.o \
$(GPEXT_OBJ)
diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c
index 910c78d05a..9e41905d79 100644
--- a/source3/utils/net_ads_gpo.c
+++ b/source3/utils/net_ads_gpo.c
@@ -73,7 +73,7 @@ static int net_ads_gpo_refresh(struct net_context *c, int argc, const char **arg
d_printf("* fetching token ");
if (uac & UF_WORKSTATION_TRUST_ACCOUNT) {
- status = gp_get_machine_token(ads, mem_ctx, dn, &token);
+ status = gp_get_machine_token(ads, mem_ctx, NULL, dn, &token);
} else {
status = ads_get_sid_token(ads, mem_ctx, dn, &token);
}
@@ -94,6 +94,8 @@ static int net_ads_gpo_refresh(struct net_context *c, int argc, const char **arg
d_printf("* refreshing Group Policy Data ");
if (!NT_STATUS_IS_OK(result = check_refresh_gpo_list(ads, mem_ctx,
+ cache_path(GPO_CACHE_DIR),
+ NULL,
flags,
gpo_list))) {
d_printf("failed: %s\n", nt_errstr(result));
@@ -326,7 +328,7 @@ static int net_ads_gpo_list(struct net_context *c, int argc, const char **argv)
argv[0], dn);
if (uac & UF_WORKSTATION_TRUST_ACCOUNT) {
- status = gp_get_machine_token(ads, mem_ctx, dn, &token);
+ status = gp_get_machine_token(ads, mem_ctx, NULL, dn, &token);
} else {
status = ads_get_sid_token(ads, mem_ctx, dn, &token);
}