summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Beck <gbeck@sernet.de>2011-04-07 11:00:41 +0200
committerMichael Adam <obnox@samba.org>2011-04-07 13:13:27 +0200
commit7d040434dcb7c75d8aefc982f60995adde08a445 (patch)
tree2ff307f15679cb48b29c86a58f8e73634182c007
parent17fe5e0ca4fb46ffe344aa93e97d948ec82acf37 (diff)
downloadsamba-7d040434dcb7c75d8aefc982f60995adde08a445.tar.gz
samba-7d040434dcb7c75d8aefc982f60995adde08a445.tar.bz2
samba-7d040434dcb7c75d8aefc982f60995adde08a445.zip
s3-net: fix the usage output of "net idmap check"
Signed-off-by: Michael Adam <obnox@samba.org>
-rw-r--r--source3/utils/net_idmap.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index c8241e2080..e059a6432c 100644
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -543,13 +543,14 @@ static int net_idmap_check(struct net_context *c, int argc, const char **argv)
if ( argc > 1 || c->display_usage) {
d_printf("%s\n%s",
_("Usage:"),
- _("net idmap check [-f] [-a] [-T] [-v] [--auto] [[--db=]<TDB>]\n"
+ _("net idmap check [-v] [-r] [-a] [-T] [-f] [-l] [[--db=]<TDB>]\n"
" Check an idmap database.\n"
+ " --verbose,-v\tverbose\n"
" --repair,-r\trepair\n"
- " --fore,-f\tforce\n"
" --auto,-a\tnoninteractive mode\n"
" --test,-T\tdry run\n"
- " --lock\tlock db while doing the check\n"
+ " --fore,-f\tforce\n"
+ " --lock,-l\tlock db while doing the check\n"
" TDB\tidmap database\n"));
return c->display_usage ? 0 : -1;
}
@@ -561,7 +562,7 @@ static int net_idmap_check(struct net_context *c, int argc, const char **argv)
d_fprintf(stderr, _("check database: %s\n"), dbfile);
opts = (struct check_options) {
- .lock = c->opt_lock,
+ .lock = c->opt_lock || c->opt_long_list_entries,
.test = c->opt_testmode,
.automatic = c->opt_auto,
.verbose = c->opt_verbose,