summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-04-11 01:27:33 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:51:12 -0500
commita7efe6c1c322467b8468399bec7ee294aeaeada8 (patch)
treeebc2de748abf122806fe35a5af80e83e8ab23b17 /source4
parent27db4c6d18b31c2e70211efe3c26816cd5d38b24 (diff)
downloadsamba-a7efe6c1c322467b8468399bec7ee294aeaeada8.tar.gz
samba-a7efe6c1c322467b8468399bec7ee294aeaeada8.tar.bz2
samba-a7efe6c1c322467b8468399bec7ee294aeaeada8.zip
r159: nicer usage messages when no URL is given
(This used to be commit 8655f0b435e06af21d5d9fa210441fbf318673f0)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/tools/ldbadd.c4
-rw-r--r--source4/lib/ldb/tools/ldbdel.c4
-rw-r--r--source4/lib/ldb/tools/ldbedit.c6
-rw-r--r--source4/lib/ldb/tools/ldbmodify.c4
-rw-r--r--source4/lib/ldb/tools/ldbsearch.c4
5 files changed, 11 insertions, 11 deletions
diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c
index 446c0d80f9..15febb76e7 100644
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.c
@@ -101,8 +101,8 @@ static int process_file(struct ldb_context *ldb, FILE *f)
}
if (!ldb_url) {
- fprintf(stderr, "You must specify a ldb URL\n");
- exit(1);
+ fprintf(stderr, "You must specify a ldb URL\n\n");
+ usage();
}
argc -= optind;
diff --git a/source4/lib/ldb/tools/ldbdel.c b/source4/lib/ldb/tools/ldbdel.c
index 0e50a68532..48ee07ad25 100644
--- a/source4/lib/ldb/tools/ldbdel.c
+++ b/source4/lib/ldb/tools/ldbdel.c
@@ -67,8 +67,8 @@ static void usage(void)
}
if (!ldb_url) {
- fprintf(stderr, "You must specify a ldb URL\n");
- exit(1);
+ fprintf(stderr, "You must specify a ldb URL\n\n");
+ usage();
}
argc -= optind;
diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c
index c5eb1349dd..13516e59cf 100644
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/source4/lib/ldb/tools/ldbedit.c
@@ -281,7 +281,7 @@ static void usage(void)
editor = "vi";
}
- while ((opt = getopt(argc, argv, "ab:e:H:s:")) != EOF) {
+ while ((opt = getopt(argc, argv, "hab:e:H:s:")) != EOF) {
switch (opt) {
case 'b':
basedn = optarg;
@@ -317,8 +317,8 @@ static void usage(void)
}
if (!ldb_url) {
- fprintf(stderr, "You must specify a ldb URL\n");
- exit(1);
+ fprintf(stderr, "You must specify a ldb URL\n\n");
+ usage();
}
argc -= optind;
diff --git a/source4/lib/ldb/tools/ldbmodify.c b/source4/lib/ldb/tools/ldbmodify.c
index a93c710a7a..ac32f90c3b 100644
--- a/source4/lib/ldb/tools/ldbmodify.c
+++ b/source4/lib/ldb/tools/ldbmodify.c
@@ -103,8 +103,8 @@ static int process_file(struct ldb_context *ldb, FILE *f)
}
if (!ldb_url) {
- fprintf(stderr, "You must specify a ldb URL\n");
- exit(1);
+ fprintf(stderr, "You must specify a ldb URL\n\n");
+ usage();
}
argc -= optind;
diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c
index 327feb28ef..45412f6104 100644
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -86,8 +86,8 @@ static void usage(void)
}
if (!ldb_url) {
- fprintf(stderr, "You must specify a ldb URL\n");
- exit(1);
+ fprintf(stderr, "You must specify a ldb URL\n\n");
+ usage();
}
argc -= optind;