summaryrefslogtreecommitdiff
path: root/source4/utils
diff options
context:
space:
mode:
authorWilco Baan Hofman <wilco@baanhofman.nl>2010-04-23 18:10:43 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-06-20 17:19:11 +0200
commitf0353fddde4a0b8aab448db779cc2c1cc419b4a0 (patch)
tree7d09196ad2421a12cda2f93aff5b72e7c563bafb /source4/utils
parent40d71815072b5258cbe3ed0f1de62be68625e25e (diff)
downloadsamba-f0353fddde4a0b8aab448db779cc2c1cc419b4a0.tar.gz
samba-f0353fddde4a0b8aab448db779cc2c1cc419b4a0.tar.bz2
samba-f0353fddde4a0b8aab448db779cc2c1cc419b4a0.zip
Changed add_gplink to set_gplink, so we can change gPLink options as well.
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Diffstat (limited to 'source4/utils')
-rw-r--r--source4/utils/net/net_gpo.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source4/utils/net/net_gpo.c b/source4/utils/net/net_gpo.c
index e828899cac..ca85bb4f58 100644
--- a/source4/utils/net/net_gpo.c
+++ b/source4/utils/net/net_gpo.c
@@ -272,14 +272,14 @@ static int net_gpo_list(struct net_context *ctx, int argc, const char **argv)
return 0;
}
-static int net_gpo_link_add_usage(struct net_context *ctx, int argc, const char **argv)
+static int net_gpo_link_set_usage(struct net_context *ctx, int argc, const char **argv)
{
- d_printf("Syntax: net gpo linkadd <container> <gpo> ['disable'] ['enforce'] [options]\n");
- d_printf("For a list of available options, please type net gpo linkadd --help\n");
+ d_printf("Syntax: net gpo linkset <container> <gpo> ['disable'] ['enforce'] [options]\n");
+ d_printf("For a list of available options, please type net gpo linkset --help\n");
return 0;
}
-static int net_gpo_link_add(struct net_context *ctx, int argc, const char **argv)
+static int net_gpo_link_set(struct net_context *ctx, int argc, const char **argv)
{
struct gp_link *gplink = talloc_zero(ctx, struct gp_link);
struct gp_context *gp_ctx;
@@ -287,7 +287,7 @@ static int net_gpo_link_add(struct net_context *ctx, int argc, const char **argv
NTSTATUS status;
if (argc < 2) {
- return net_gpo_link_add_usage(ctx, argc, argv);
+ return net_gpo_link_set_usage(ctx, argc, argv);
}
if (argc >= 3) {
@@ -308,9 +308,9 @@ static int net_gpo_link_add(struct net_context *ctx, int argc, const char **argv
return 1;
}
- status = gp_add_gplink(gp_ctx, argv[0], gplink);
+ status = gp_set_gplink(gp_ctx, argv[0], gplink);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to add GPO link to container: %s\n", get_friendly_nt_error_msg(status)));
+ 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");
@@ -326,7 +326,7 @@ static const struct net_functable net_gpo_functable[] = {
{ "listall", "List all GPO's on a DC\n", net_gpo_list_all, net_gpo_list_all_usage },
{ "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 },
- { "linkadd", "Link a GPO to a container\n", net_gpo_link_add, net_gpo_link_add_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 }, */
{ "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 }, */