diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-01 18:45:25 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-01 18:55:20 +1100 |
| commit | 6f2c4abadd6097d949b388cc4d9c4ebd77f0df10 (patch) | |
| tree | 591f61a1a94fb7070065351a4f90987ea2d3e45d /source4/lib/ldb/tools/ldbedit.c | |
| parent | f924a022cbc973ae646bff5119a1784e979a052f (diff) | |
| download | samba-6f2c4abadd6097d949b388cc4d9c4ebd77f0df10.tar.gz samba-6f2c4abadd6097d949b388cc4d9c4ebd77f0df10.tar.bz2 samba-6f2c4abadd6097d949b388cc4d9c4ebd77f0df10.zip | |
s4-ldb: convert existing ldb tools to use new command line hooks
the usage() function needs to take a ldb context, as the popt_options
is specific to the ldb context
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/lib/ldb/tools/ldbedit.c')
| -rw-r--r-- | source4/lib/ldb/tools/ldbedit.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c index 4deeb30ee9..b311073b05 100644 --- a/source4/lib/ldb/tools/ldbedit.c +++ b/source4/lib/ldb/tools/ldbedit.c @@ -31,13 +31,8 @@ * Author: Andrew Tridgell */ -#ifdef _SAMBA_BUILD_ -#include "includes.h" -#include <system/filesys.h> -#else #include "ldb_includes.h" -#endif - +#include "system/filesys.h" #include "ldb.h" #include "tools/cmdline.h" #include "tools/ldbutil.h" @@ -287,10 +282,10 @@ static int do_edit(struct ldb_context *ldb, struct ldb_message **msgs1, return merge_edits(ldb, msgs1, count1, msgs2, count2); } -static void usage(void) +static void usage(struct ldb_context *ldb) { printf("Usage: ldbedit <options> <expression> <attributes ...>\n"); - ldb_cmdline_help("ldbedit", stdout); + ldb_cmdline_help(ldb, "ldbedit", stdout); exit(1); } |