From bde679e6f84b16d63a8007fe48789ee7951b9f34 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 2 Sep 2009 18:31:22 +1000 Subject: show the full set of command line options for ldb tools I always found it hard to remember some of the options. We might as well use popt to give us the full list --- source4/lib/ldb/tools/ldbadd.c | 8 ++------ source4/lib/ldb/tools/ldbdel.c | 7 +------ source4/lib/ldb/tools/ldbedit.c | 8 +------- source4/lib/ldb/tools/ldbmodify.c | 6 +----- source4/lib/ldb/tools/ldbrename.c | 6 +----- 5 files changed, 6 insertions(+), 29 deletions(-) (limited to 'source4') diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c index be02334797..086540dfdf 100644 --- a/source4/lib/ldb/tools/ldbadd.c +++ b/source4/lib/ldb/tools/ldbadd.c @@ -38,13 +38,9 @@ static int failures; static void usage(void) { - printf("Usage: ldbadd \n"); - printf("Options:\n"); - printf(" -H ldb_url choose the database (or $LDB_URL)\n"); - printf(" -o options pass options like modules to activate\n"); - printf(" e.g: -o modules:timestamps\n"); - printf("\n"); + printf("Usage: ldbadd \n"); printf("Adds records to a ldb, reading ldif the specified list of files\n\n"); + ldb_cmdline_help("ldbadd", stdout); exit(1); } diff --git a/source4/lib/ldb/tools/ldbdel.c b/source4/lib/ldb/tools/ldbdel.c index 232f51681a..ddf168d574 100644 --- a/source4/lib/ldb/tools/ldbdel.c +++ b/source4/lib/ldb/tools/ldbdel.c @@ -61,13 +61,8 @@ static int ldb_delete_recursive(struct ldb_context *ldb, struct ldb_dn *dn) static void usage(void) { printf("Usage: ldbdel \n"); - printf("Options:\n"); - printf(" -r recursively delete the given subtree\n"); - printf(" -H ldb_url choose the database (or $LDB_URL)\n"); - printf(" -o options pass options like modules to activate\n"); - printf(" e.g: -o modules:timestamps\n"); - printf("\n"); printf("Deletes records from a ldb\n\n"); + ldb_cmdline_help("ldbdel", stdout); exit(1); } diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c index 9d3bd27983..9653eabcb9 100644 --- a/source4/lib/ldb/tools/ldbedit.c +++ b/source4/lib/ldb/tools/ldbedit.c @@ -270,13 +270,7 @@ static int do_edit(struct ldb_context *ldb, struct ldb_message **msgs1, int coun static void usage(void) { printf("Usage: ldbedit \n"); - printf("Options:\n"); - printf(" -H ldb_url choose the database (or $LDB_URL)\n"); - printf(" -s base|sub|one choose search scope\n"); - printf(" -b basedn choose baseDN\n"); - printf(" -a edit all records (expression 'objectclass=*')\n"); - printf(" -e editor choose editor (or $VISUAL or $EDITOR)\n"); - printf(" -v verbose mode\n"); + ldb_cmdline_help("ldbedit", stdout); exit(1); } diff --git a/source4/lib/ldb/tools/ldbmodify.c b/source4/lib/ldb/tools/ldbmodify.c index 23a96a3976..d0bca0479b 100644 --- a/source4/lib/ldb/tools/ldbmodify.c +++ b/source4/lib/ldb/tools/ldbmodify.c @@ -39,12 +39,8 @@ static int failures; static void usage(void) { printf("Usage: ldbmodify \n"); - printf("Options:\n"); - printf(" -H ldb_url choose the database (or $LDB_URL)\n"); - printf(" -o options pass options like modules to activate\n"); - printf(" e.g: -o modules:timestamps\n"); - printf("\n"); printf("Modifies a ldb based upon ldif change records\n\n"); + ldb_cmdline_help("ldbmodify", stdout); exit(1); } diff --git a/source4/lib/ldb/tools/ldbrename.c b/source4/lib/ldb/tools/ldbrename.c index 01ed3d9835..fcae766a20 100644 --- a/source4/lib/ldb/tools/ldbrename.c +++ b/source4/lib/ldb/tools/ldbrename.c @@ -39,12 +39,8 @@ static void usage(void) { printf("Usage: ldbrename [] \n"); - printf("Options:\n"); - printf(" -H ldb_url choose the database (or $LDB_URL)\n"); - printf(" -o options pass options like modules to activate\n"); - printf(" e.g: -o modules:timestamps\n"); - printf("\n"); printf("Renames records in a ldb\n\n"); + ldb_cmdline_help("ldbmodify", stdout); exit(1); } -- cgit