From d06f4fa8345aaef6e7e88586c8e2f3dd3c20c0f7 Mon Sep 17 00:00:00 2001 From: Jim McDonough Date: Thu, 9 May 2002 23:46:01 +0000 Subject: Converged help on net group command. (This used to be commit 9de5e0dc73f57e8c8b878da803452b86e6ce8fca) --- source3/utils/net_help.c | 18 +++++++++++++++++- source3/utils/net_rap.c | 12 +----------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/source3/utils/net_help.c b/source3/utils/net_help.c index 21af8a4fd9..31065a26b8 100644 --- a/source3/utils/net_help.c +++ b/source3/utils/net_help.c @@ -78,11 +78,27 @@ int net_help_user(int argc, const char **argv) return -1; } +int net_help_group(int argc, const char **argv) +{ + d_printf("net [method] group [misc. options] [targets]"\ + "\n\tList user groups\n\n"); + d_printf("net [method] group DELETE [misc. options] [targets]"\ + "\n\tDelete specified group\n"); + d_printf("\nnet [method] group ADD [-C comment]"\ + " [misc. options] [targets]\n\tCreate specified group\n"); + net_common_methods_usage(argc, argv); + net_common_flags_usage(argc, argv); + d_printf( + "\t-C or --comment=\tdescriptive comment (for add only)\n"); + return -1; +} + static int net_usage(int argc, const char **argv) { d_printf(" net time\t\tto view or set time information\n"\ " net lookup\t\tto lookup host name or ip address\n"\ " net user\t\tto manage users\n"\ + " net group\t\tto manage groups\n"\ " net join\t\tto join a domain\n"\ "\n"\ " net ads [command]\tto run ADS commands\n"\ @@ -110,7 +126,7 @@ int net_help(int argc, const char **argv) {"DOMAIN", net_rap_domain_usage}, {"PRINTQ", net_rap_printq_usage}, {"USER", net_help_user}, - {"GROUP", net_rap_group_usage}, + {"GROUP", net_help_group}, {"VALIDATE", net_rap_validate_usage}, {"GROUPMEMBER", net_rap_groupmember_usage}, {"ADMIN", net_rap_admin_usage}, diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c index a6b199fd88..248e601df9 100644 --- a/source3/utils/net_rap.c +++ b/source3/utils/net_rap.c @@ -732,17 +732,7 @@ int net_rap_user(int argc, const char **argv) int net_rap_group_usage(int argc, const char **argv) { - d_printf("net rap group [misc. options] [targets]"\ - "\n\tList user groups\n"); - d_printf("\nnet rap group DELETE [misc. options] [targets]"\ - "\n\tDelete specified group\n"); - d_printf("\nnet rap group ADD [-C comment] [misc. options]"\ - " [targets]\n\tCreate specified group\n"); - - net_common_flags_usage(argc, argv); - d_printf( - "\t-C or --comment=\tdescriptive comment (for add only)\n"); - return -1; + return net_help_group(argc, argv); } static void long_group_fn(const char *group_name, const char *comment, -- cgit