summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/utils/net.c11
-rw-r--r--source3/utils/net_ads.c2
-rw-r--r--source3/utils/net_group.c65
-rw-r--r--source3/utils/net_help.c24
-rw-r--r--source3/utils/net_proto.h6
-rw-r--r--source3/utils/net_rap.c2
-rw-r--r--source3/utils/net_rpc.c2
8 files changed, 75 insertions, 39 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index c752b09629..592abe01bf 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -881,7 +881,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
utils/net_util.o utils/net_rpc_sh_acct.o utils/net_rpc_audit.o \
$(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
utils/net_conf.o utils/net_join.o utils/net_user.o \
- utils/net_registry.o \
+ utils/net_group.o utils/net_registry.o \
auth/token_util.o utils/net_dom.o
# these are not processed by make proto
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 6f29d04ccd..614d3f1ea2 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -563,17 +563,6 @@ done:
return nt_status;
}
-static int net_group(struct net_context *c, int argc, const char **argv)
-{
- if (net_ads_check(c) == 0)
- return net_ads_group(c, argc, argv);
-
- if (argc == 0 && net_rpc_check(c, NET_FLAGS_PDC))
- return net_rpc_group(c,argc, argv);
-
- return net_rap_group(c, argc, argv);
-}
-
static int net_changetrustpw(struct net_context *c, int argc, const char **argv)
{
if (net_ads_check_our_domain(c) == 0)
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 2c1d72c720..40bbdad0c6 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -647,7 +647,7 @@ int net_ads_user(struct net_context *c, int argc, const char **argv)
static int net_ads_group_usage(struct net_context *c, int argc, const char **argv)
{
- return net_help_group(c, argc, argv);
+ return net_group_usage(c, argc, argv);
}
static int ads_group_add(struct net_context *c, int argc, const char **argv)
diff --git a/source3/utils/net_group.c b/source3/utils/net_group.c
new file mode 100644
index 0000000000..2d5dba8b58
--- /dev/null
+++ b/source3/utils/net_group.c
@@ -0,0 +1,65 @@
+/*
+ Samba Unix/Linux SMB client library
+ net group commands
+ Copyright (C) 2002 Jim McDonough (jmcd@us.ibm.com)
+ Copyright (C) 2002 Andrew Tridgell (tridge@samba.org)
+ Copyright (C) 2008 Kai Blin (kai@samba.org)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "utils/net.h"
+
+int net_group_usage(struct net_context *c, int argc, const char **argv)
+{
+ d_printf("net [<method>] group [misc. options] [targets]"\
+ "\n\tList user groups\n\n");
+ d_printf("net rpc group LIST [global|local|builtin]* [misc. options]"\
+ "\n\tList specific user groups\n\n");
+ d_printf("net [<method>] group DELETE <name> "\
+ "[misc. options] [targets]"\
+ "\n\tDelete specified group\n");
+ d_printf("\nnet [<method>] group ADD <name> [-C comment] [-c container]"\
+ " [misc. options] [targets]\n\tCreate specified group\n");
+ d_printf("\nnet rpc group MEMBERS <name>\n\tList Group Members\n\n");
+ d_printf("\nnet rpc group ADDMEM <group> <member>\n\tAdd Group Members\n\n");
+ d_printf("\nnet rpc group DELMEM <group> <member>\n\tDelete Group Members\n\n");
+ net_common_methods_usage(c, argc, argv);
+ net_common_flags_usage(c, argc, argv);
+ d_printf("\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
+ d_printf("\t-c or --container=<container>\tLDAP container, defaults to cn=Users (for add in ADS only)\n");
+ d_printf("\t-L or --localgroup\t\tWhen adding groups, create a local group (alias)\n");
+ return -1;
+}
+
+int net_group(struct net_context *c, int argc, const char **argv)
+{
+ if (argc < 1)
+ return net_group_usage(c, argc, argv);
+
+ if (StrCaseCmp(argv[0], "HELP") == 0) {
+ net_group_usage(c, argc, argv);
+ return 0;
+ }
+
+ if (net_ads_check(c) == 0)
+ return net_ads_group(c, argc, argv);
+
+ if (argc == 0 && net_rpc_check(c, NET_FLAGS_PDC))
+ return net_rpc_group(c,argc, argv);
+
+ return net_rap_group(c, argc, argv);
+}
+
diff --git a/source3/utils/net_help.c b/source3/utils/net_help.c
index a55b0332e2..4d53898305 100644
--- a/source3/utils/net_help.c
+++ b/source3/utils/net_help.c
@@ -33,28 +33,6 @@ static int help_usage(struct net_context *c, int argc, const char **argv)
return -1;
}
-int net_help_group(struct net_context *c, int argc, const char **argv)
-{
- d_printf("net [<method>] group [misc. options] [targets]"\
- "\n\tList user groups\n\n");
- d_printf("net rpc group LIST [global|local|builtin]* [misc. options]"\
- "\n\tList specific user groups\n\n");
- d_printf("net [<method>] group DELETE <name> "\
- "[misc. options] [targets]"\
- "\n\tDelete specified group\n");
- d_printf("\nnet [<method>] group ADD <name> [-C comment] [-c container]"\
- " [misc. options] [targets]\n\tCreate specified group\n");
- d_printf("\nnet rpc group MEMBERS <name>\n\tList Group Members\n\n");
- d_printf("\nnet rpc group ADDMEM <group> <member>\n\tAdd Group Members\n\n");
- d_printf("\nnet rpc group DELMEM <group> <member>\n\tDelete Group Members\n\n");
- net_common_methods_usage(c, argc, argv);
- net_common_flags_usage(c, argc, argv);
- d_printf("\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
- d_printf("\t-c or --container=<container>\tLDAP container, defaults to cn=Users (for add in ADS only)\n");
- d_printf("\t-L or --localgroup\t\tWhen adding groups, create a local group (alias)\n");
- return -1;
-}
-
int net_help_share(struct net_context *c, int argc, const char **argv)
{
d_printf(
@@ -199,7 +177,7 @@ int net_help(struct net_context *c, int argc, const char **argv)
{"DOMAIN", net_rap_domain_usage},
{"PRINTQ", net_rap_printq_usage},
{"USER", net_user_usage},
- {"GROUP", net_help_group},
+ {"GROUP", net_group_usage},
{"GROUPMAP", net_help_groupmap},
{"JOIN", net_join_usage},
{"DOM", net_help_dom},
diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index 2462135a2e..0e35ee7fed 100644
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -138,6 +138,11 @@ int get_my_ip_address( struct sockaddr_storage **pp_ss );
int net_help_dom(struct net_context *c, int argc, const char **argv);
int net_dom(struct net_context *c, int argc, const char **argv);
+/* The following definitions come from utils/net_group.c */
+
+int net_group_usage(struct net_context *c, int argc, const char **argv);
+int net_group(struct net_context *c, int argc, const char **argv);
+
/* The following definitions come from utils/net_groupmap.c */
int net_help_groupmap(struct net_context *c, int argc, const char **argv);
@@ -145,7 +150,6 @@ int net_groupmap(struct net_context *c, int argc, const char **argv);
/* The following definitions come from utils/net_help.c */
-int net_help_group(struct net_context *c, int argc, const char **argv);
int net_help_share(struct net_context *c, int argc, const char **argv);
int net_help_file(struct net_context *c, int argc, const char **argv);
int net_help_printer(struct net_context *c, int argc, const char **argv);
diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c
index e71e3632c5..ea46469a29 100644
--- a/source3/utils/net_rap.c
+++ b/source3/utils/net_rap.c
@@ -762,7 +762,7 @@ int net_rap_user(struct net_context *c, int argc, const char **argv)
int net_rap_group_usage(struct net_context *c, int argc, const char **argv)
{
- return net_help_group(c, argc, argv);
+ return net_group_usage(c, argc, argv);
}
static void long_group_fn(const char *group_name, const char *comment,
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 7bb82ad661..2bf2b9b2ad 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -1586,7 +1586,7 @@ struct rpc_sh_cmd *net_rpc_user_cmds(struct net_context *c,
static int rpc_group_usage(struct net_context *c, int argc, const char **argv)
{
- return net_help_group(c, argc, argv);
+ return net_group_usage(c, argc, argv);
}
/**