summaryrefslogtreecommitdiff
path: root/source4/utils/net/net_join.c
diff options
context:
space:
mode:
authorRafal Szczesniak <mimir@samba.org>2005-02-15 01:11:20 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:10:41 -0500
commit530d46f6748a17ca8500a861f53c0d4f451b2005 (patch)
tree2d48faf15fff2866be9eec548802ef5f28114b0d /source4/utils/net/net_join.c
parente428eee91b3506c0c02a35dbf01e55da2c73b547 (diff)
downloadsamba-530d46f6748a17ca8500a861f53c0d4f451b2005.tar.gz
samba-530d46f6748a17ca8500a861f53c0d4f451b2005.tar.bz2
samba-530d46f6748a17ca8500a861f53c0d4f451b2005.zip
r5400: Slightly better handling of help messages in net tool.
rafal (This used to be commit 5cebb4feedf7d6542c497fe55763d66f51b1c989)
Diffstat (limited to 'source4/utils/net/net_join.c')
-rw-r--r--source4/utils/net/net_join.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/source4/utils/net/net_join.c b/source4/utils/net/net_join.c
index cb093ef9ff..6183da87b5 100644
--- a/source4/utils/net/net_join.c
+++ b/source4/utils/net/net_join.c
@@ -36,8 +36,7 @@ int net_join(struct net_context *ctx, int argc, const char **argv)
switch (argc) {
case 0: /* no args -> fail */
- DEBUG(0,("net_join_domain: no args\n"));
- return -1;
+ return net_join_usage(ctx, argc, argv);
case 1: /* only DOMAIN */
tmp = talloc_strdup(ctx->mem_ctx, argv[0]);
break;
@@ -49,12 +48,11 @@ int net_join(struct net_context *ctx, int argc, const char **argv)
secure_channel_type = SEC_CHAN_WKSTA;
} else {
DEBUG(0, ("net_join: 2nd argument must be MEMBER or BDC\n"));
- return -1;
+ return net_join_usage(ctx, argc, argv);
}
break;
default: /* too many args -> fail */
- DEBUG(0,("net_join: too many args [%d]\n",argc));
- return -1;
+ return net_join_usage(ctx, argc, argv);
}
domain_name = tmp;
@@ -89,12 +87,12 @@ int net_join(struct net_context *ctx, int argc, const char **argv)
int net_join_usage(struct net_context *ctx, int argc, const char **argv)
{
- d_printf("net_password_usage: TODO\n");
+ d_printf("net join <domain> [BDC | MEMBER] [options]\n");
return 0;
}
int net_join_help(struct net_context *ctx, int argc, const char **argv)
{
- d_printf("net_password_help: TODO\n");
+ d_printf("Joins domain as either member or backup domain controller.\n");
return 0;
}