From 9c01e69ade92c171b3f7567e77df1ac02e9f8920 Mon Sep 17 00:00:00 2001 From: Gregor Beck Date: Thu, 7 Apr 2011 11:00:41 +0200 Subject: [PATCH] s3-net: fix the usage output of "net idmap check" Signed-off-by: Michael Adam --- source3/utils/net_idmap.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c index c8241e20800..e059a6432c0 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=]]\n" + _("net idmap check [-v] [-r] [-a] [-T] [-f] [-l] [[--db=]]\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, -- 2.11.4.GIT