summaryrefslogtreecommitdiff
path: root/source4/utils/net
diff options
context:
space:
mode:
authorWilco Baan Hofman <wilco@baanhofman.nl>2010-04-23 19:12:01 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-06-20 17:19:11 +0200
commita4cb72790cfc8f267f8574de3eea8634aed62e57 (patch)
tree04ba4927fcc6550cffda5e2fd5eac70d4376c292 /source4/utils/net
parentf0353fddde4a0b8aab448db779cc2c1cc419b4a0 (diff)
downloadsamba-a4cb72790cfc8f267f8574de3eea8634aed62e57.tar.gz
samba-a4cb72790cfc8f267f8574de3eea8634aed62e57.tar.bz2
samba-a4cb72790cfc8f267f8574de3eea8634aed62e57.zip
Implemented delete group policy link function and corresponding feature in net gpo.
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Diffstat (limited to 'source4/utils/net')
-rw-r--r--source4/utils/net/net_gpo.c40
1 files changed, 38 insertions, 2 deletions
diff --git a/source4/utils/net/net_gpo.c b/source4/utils/net/net_gpo.c
index ca85bb4f58..61e10bc395 100644
--- a/source4/utils/net/net_gpo.c
+++ b/source4/utils/net/net_gpo.c
@@ -313,7 +313,43 @@ static int net_gpo_link_set(struct net_context *ctx, int argc, const char **argv
DEBUG(0, ("Failed to set GPO link on container: %s\n", get_friendly_nt_error_msg(status)));
return 1;
}
- d_printf("Added link to container.\n");
+ d_printf("Set link on container.\nCurrent Group Policy links:\n");
+
+ /* Display current links */
+ net_gpo_link_get(ctx, 1, argv);
+
+ talloc_free(gp_ctx);
+ return 0;
+}
+
+static int net_gpo_link_del_usage(struct net_context *ctx, int argc, const char **argv)
+{
+ d_printf("Syntax: net gpo linkdel <container> <gpo> [options]\n");
+ d_printf("For a list of available options, please type net gpo linkdel --help\n");
+ return 0;
+}
+
+static int net_gpo_link_del(struct net_context *ctx, int argc, const char **argv)
+{
+ struct gp_context *gp_ctx;
+ NTSTATUS status;
+
+ if (argc != 2) {
+ return net_gpo_link_del_usage(ctx, argc, argv);
+ }
+
+ status = gp_init(ctx, ctx->lp_ctx, ctx->credentials, ctx->event_ctx, &gp_ctx);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("Failed to connect to DC's LDAP: %s\n", get_friendly_nt_error_msg(status)));
+ return 1;
+ }
+
+ status = gp_del_gplink(gp_ctx, argv[0], argv[1]);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("Failed to delete gplink: %s\n", get_friendly_nt_error_msg(status)));
+ return 1;
+ }
+ d_printf("Deleted gplink.\nCurrent Group Policy links:\n\n");
/* Display current links */
net_gpo_link_get(ctx, 1, argv);
@@ -327,7 +363,7 @@ static const struct net_functable net_gpo_functable[] = {
{ "getgpo", "List specificied GPO\n", net_gpo_get_gpo, net_gpo_get_gpo_usage },
{ "linkget", "List gPLink of container\n", net_gpo_link_get, net_gpo_link_get_usage },
{ "linkset", "Link a GPO to a container\n", net_gpo_link_set, net_gpo_link_set_usage },
-/* { "linkdelete", "Delete GPO link from a container\n", net_gpo_link_delete, net_gpo_usage }, */
+ { "linkdel", "Delete GPO link from a container\n", net_gpo_link_del, net_gpo_link_del_usage },
{ "list", "List all GPO's for a machine/user\n", net_gpo_list, net_gpo_list_usage },
/* { "apply", "Apply GPO to container\n", net_gpo_apply, net_gpo_usage }, */
// { "refresh", "List all GPO's for machine/user and download them\n", net_gpo_refresh, net_gpo_refresh_usage },