summaryrefslogtreecommitdiff
path: root/usr/src/cmd/smbsrv/smbadm/smbadm.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd/smbsrv/smbadm/smbadm.c')
-rw-r--r--usr/src/cmd/smbsrv/smbadm/smbadm.c74
1 files changed, 34 insertions, 40 deletions
diff --git a/usr/src/cmd/smbsrv/smbadm/smbadm.c b/usr/src/cmd/smbsrv/smbadm/smbadm.c
index 0b4072c0e5..234c8332ce 100644
--- a/usr/src/cmd/smbsrv/smbadm/smbadm.c
+++ b/usr/src/cmd/smbsrv/smbadm/smbadm.c
@@ -123,36 +123,37 @@ static int smbadm_user_delete(int, char **);
static int smbadm_user_disable(int, char **);
static int smbadm_user_enable(int, char **);
+/* Please keep the order consistent with smbadm(1M) man page */
static smbadm_cmdinfo_t smbadm_cmdtable[] =
{
- { "add-member", smbadm_group_addmember, HELP_ADD_MEMBER,
- SMBADM_CMDF_GROUP, SMBADM_ACTION_AUTH },
{ "create", smbadm_group_create, HELP_CREATE,
SMBADM_CMDF_GROUP, SMBADM_ACTION_AUTH },
{ "delete", smbadm_group_delete, HELP_DELETE,
SMBADM_CMDF_GROUP, SMBADM_ACTION_AUTH },
+ { "rename", smbadm_group_rename, HELP_RENAME,
+ SMBADM_CMDF_GROUP, SMBADM_ACTION_AUTH },
+ { "show", smbadm_group_show, HELP_SHOW,
+ SMBADM_CMDF_GROUP, SMBADM_ACTION_AUTH },
+ { "get", smbadm_group_getprop, HELP_GET,
+ SMBADM_CMDF_GROUP, SMBADM_ACTION_AUTH },
+ { "set", smbadm_group_setprop, HELP_SET,
+ SMBADM_CMDF_GROUP, SMBADM_ACTION_AUTH },
+ { "add-member", smbadm_group_addmember, HELP_ADD_MEMBER,
+ SMBADM_CMDF_GROUP, SMBADM_ACTION_AUTH },
+ { "remove-member", smbadm_group_delmember, HELP_DEL_MEMBER,
+ SMBADM_CMDF_GROUP, SMBADM_ACTION_AUTH },
{ "delete-user", smbadm_user_delete, HELP_USER_DELETE,
SMBADM_CMDF_USER, SMBADM_ACTION_AUTH },
{ "disable-user", smbadm_user_disable, HELP_USER_DISABLE,
SMBADM_CMDF_USER, SMBADM_ACTION_AUTH },
{ "enable-user", smbadm_user_enable, HELP_USER_ENABLE,
SMBADM_CMDF_USER, SMBADM_ACTION_AUTH },
- { "get", smbadm_group_getprop, HELP_GET,
- SMBADM_CMDF_GROUP, SMBADM_ACTION_AUTH },
{ "join", smbadm_join, HELP_JOIN,
SMBADM_CMDF_NONE, SMBADM_VALUE_AUTH },
{ "list", smbadm_list, HELP_LIST,
SMBADM_CMDF_NONE, SMBADM_BASIC_AUTH },
{ "lookup", smbadm_lookup, HELP_LOOKUP,
SMBADM_CMDF_NONE, SMBADM_BASIC_AUTH },
- { "remove-member", smbadm_group_delmember, HELP_DEL_MEMBER,
- SMBADM_CMDF_GROUP, SMBADM_ACTION_AUTH },
- { "rename", smbadm_group_rename, HELP_RENAME,
- SMBADM_CMDF_GROUP, SMBADM_ACTION_AUTH },
- { "set", smbadm_group_setprop, HELP_SET,
- SMBADM_CMDF_GROUP, SMBADM_ACTION_AUTH },
- { "show", smbadm_group_show, HELP_SHOW,
- SMBADM_CMDF_GROUP, SMBADM_ACTION_AUTH },
};
#define SMBADM_NCMD (sizeof (smbadm_cmdtable) / sizeof (smbadm_cmdtable[0]))
@@ -185,11 +186,11 @@ static int smbadm_setprop_desc(char *gname, smbadm_prop_t *prop);
static int smbadm_getprop_desc(char *gname, smbadm_prop_t *prop);
static smbadm_prop_handle_t smbadm_ptable[] = {
- {"backup", "on | off", smbadm_setprop_backup,
+ {"backup", "on|off", smbadm_setprop_backup,
smbadm_getprop_backup, smbadm_chkprop_priv },
- {"restore", "on | off", smbadm_setprop_restore,
+ {"restore", "on|off", smbadm_setprop_restore,
smbadm_getprop_restore, smbadm_chkprop_priv },
- {"take-ownership", "on | off", smbadm_setprop_tkowner,
+ {"take-ownership", "on|off", smbadm_setprop_tkowner,
smbadm_getprop_tkowner, smbadm_chkprop_priv },
{"description", "<string>", smbadm_setprop_desc,
smbadm_getprop_desc, NULL },
@@ -210,75 +211,70 @@ smbadm_cmdusage(FILE *fp, smbadm_cmdinfo_t *cmd)
switch (cmd->usage) {
case HELP_ADD_MEMBER:
(void) fprintf(fp,
- gettext("\t%s -m member [[-m member] ...] group\n"),
+ gettext("\t%s -m <member> [-m <member>]... <group>\n"),
cmd->name);
return;
case HELP_CREATE:
- (void) fprintf(fp, gettext("\t%s [-d description] group\n"),
+ (void) fprintf(fp, gettext("\t%s [-d <description>] <group>\n"),
cmd->name);
return;
case HELP_DELETE:
- (void) fprintf(fp, gettext("\t%s group\n"), cmd->name);
+ (void) fprintf(fp, gettext("\t%s <group>\n"), cmd->name);
return;
case HELP_USER_DELETE:
case HELP_USER_DISABLE:
case HELP_USER_ENABLE:
- (void) fprintf(fp, gettext("\t%s user\n"), cmd->name);
+ (void) fprintf(fp, gettext("\t%s <username>\n"), cmd->name);
return;
case HELP_GET:
- (void) fprintf(fp, gettext("\t%s [[-p property] ...] group\n"),
+ (void) fprintf(fp, gettext("\t%s [-p <property>]... <group>\n"),
cmd->name);
return;
case HELP_JOIN:
-#if 0 /* Don't document "-p" yet, still needs work (NX 11960) */
- (void) fprintf(fp, gettext("\t%s [-y] -p domain\n"
- "\t%s [-y] -u username domain\n\t%s [-y] -w workgroup\n"),
+#if 0 /* Don't document "-p" yet, still needs work (NEX-11960) */
+ (void) fprintf(fp, gettext("\t%s [-y] -p <domain>\n"
+ "\t%s [-y] -u <username domain>\n"
+ "\t%s [-y] -w <workgroup>\n"),
cmd->name, cmd->name, cmd->name);
#else
- (void) fprintf(fp, gettext("\t%s [-y] -u username domain\n"
- "\t%s [-y] -w workgroup\n"), cmd->name, cmd->name);
+ (void) fprintf(fp, gettext("\t%s [-y] -u <username> <domain>\n"
+ "\t%s [-y] -w <workgroup>\n"), cmd->name, cmd->name);
#endif
return;
case HELP_LIST:
(void) fprintf(fp, gettext("\t%s\n"), cmd->name);
- (void) fprintf(fp,
- gettext("\t\t[*] primary domain\n"));
- (void) fprintf(fp, gettext("\t\t[.] local domain\n"));
- (void) fprintf(fp, gettext("\t\t[-] other domains\n"));
- (void) fprintf(fp,
- gettext("\t\t[+] selected domain controller\n"));
return;
case HELP_LOOKUP:
(void) fprintf(fp,
- gettext("\t%s user-or-group-name\n"),
+ gettext("\t%s <account-name>\n"),
cmd->name);
return;
case HELP_DEL_MEMBER:
(void) fprintf(fp,
- gettext("\t%s -m member [[-m member] ...] group\n"),
+ gettext("\t%s -m <member> [-m <member>]... <group>\n"),
cmd->name);
return;
case HELP_RENAME:
- (void) fprintf(fp, gettext("\t%s group new-group\n"),
+ (void) fprintf(fp, gettext("\t%s <group> <new-group>\n"),
cmd->name);
return;
case HELP_SET:
- (void) fprintf(fp, gettext("\t%s -p property=value "
- "[[-p property=value] ...] group\n"), cmd->name);
+ (void) fprintf(fp, gettext("\t%s -p <property>=<value> "
+ "[-p <property>=<value>]... <group>\n"), cmd->name);
return;
case HELP_SHOW:
- (void) fprintf(fp, gettext("\t%s [-m] [-p] [group]\n"),
+ (void) fprintf(fp, gettext("\t%s [-mp] [<group>]\n"),
cmd->name);
return;
@@ -299,10 +295,8 @@ smbadm_usage(boolean_t requested)
if (curcmd == NULL) {
(void) fprintf(fp,
- gettext("usage: %s [-h | <command> [options]]\n"),
+ gettext("usage: %s <subcommand> <args> ...\n"),
progname);
- (void) fprintf(fp,
- gettext("where 'command' is one of the following:\n\n"));
for (i = 0; i < SMBADM_NCMD; i++)
smbadm_cmdusage(fp, &smbadm_cmdtable[i]);