r12843: get special objects with ldbsearch -a too, to match ldbedit -a

metze

diff --git a/source/lib/ldb/tools/cmdline.c b/source/lib/ldb/tools/cmdline.c
index ee9e5f5e47b37ab144ca2059abc6d798a3105ed5..7f715a46b12bafc70f1ff2006e5f8884fcb7eab9 100644 (file)
--- a/source/lib/ldb/tools/cmdline.c
+++ b/source/lib/ldb/tools/cmdline.c
@@ -55,7 +55,7 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const
                { "recursive", 'r', POPT_ARG_NONE, &options.recursive, 0, "recursive delete", NULL },
                { "num-searches", 0, POPT_ARG_INT, &options.num_searches, 0, "number of test searches", NULL },
                { "num-records", 0, POPT_ARG_INT, &options.num_records, 0, "number of test records", NULL },
                { "recursive", 'r', POPT_ARG_NONE, &options.recursive, 0, "recursive delete", NULL },
                { "num-searches", 0, POPT_ARG_INT, &options.num_searches, 0, "number of test searches", NULL },
                { "num-records", 0, POPT_ARG_INT, &options.num_records, 0, "number of test records", NULL },

-               { "all", 'a',    POPT_ARG_NONE, &options.all_records, 0, "objectClass=*", NULL },
+               { "all", 'a',    POPT_ARG_NONE, &options.all_records, 0, "(|(objectClass=*)(distinguishedName=*))", NULL },

                { "nosync", 0,   POPT_ARG_NONE, &options.nosync, 0, "non-synchronous transactions", NULL },
                { "sorted", 'S', POPT_ARG_NONE, &options.sorted, 0, "sort attributes", NULL },
                { "sasl-mechanism", 0, POPT_ARG_STRING, &options.sasl_mechanism, 0, "choose SASL mechanism", "MECHANISM" },
                { "nosync", 0,   POPT_ARG_NONE, &options.nosync, 0, "non-synchronous transactions", NULL },
                { "sorted", 'S', POPT_ARG_NONE, &options.sorted, 0, "sort attributes", NULL },
                { "sasl-mechanism", 0, POPT_ARG_STRING, &options.sasl_mechanism, 0, "choose SASL mechanism", "MECHANISM" },

diff --git a/source/lib/ldb/tools/ldbedit.c b/source/lib/ldb/tools/ldbedit.c
index 24fcf1a9699ebee511e41ab79eff8f3703c88038..9cef81f1db3c2397485d2f87ce9b51d4de757aac 100644 (file)
--- a/source/lib/ldb/tools/ldbedit.c
+++ b/source/lib/ldb/tools/ldbedit.c
@@ -278,7 +278,7 @@ static void usage(void)
        struct ldb_result *result = NULL;
        struct ldb_dn *basedn = NULL;
        int ret;
        struct ldb_result *result = NULL;
        struct ldb_dn *basedn = NULL;
        int ret;

-       const char *expression = "(|(objectclass=*)(distinguishedName=*))";
+       const char *expression = "(|(objectClass=*)(distinguishedName=*))";

        const char * const * attrs = NULL;
 
        ldb = ldb_init(NULL);
        const char * const * attrs = NULL;
 
        ldb = ldb_init(NULL);

diff --git a/source/lib/ldb/tools/ldbsearch.c b/source/lib/ldb/tools/ldbsearch.c
index 46a67ad324812f6f2ab9432e7612fa09828f40f4..3b4f84c9291a0f83f836ae46613d34383f4ec23d 100644 (file)
--- a/source/lib/ldb/tools/ldbsearch.c
+++ b/source/lib/ldb/tools/ldbsearch.c
@@ -324,7 +324,7 @@ static int do_search(struct ldb_context *ldb,
        const char * const * attrs = NULL;
        struct ldb_cmdline *options;
        int ret = -1;
        const char * const * attrs = NULL;
        struct ldb_cmdline *options;
        int ret = -1;

-       const char *expression = "(objectclass=*)";
+       const char *expression = "(|(objectClass=*)(distinguishedName=*))";

 
        ldb = ldb_init(NULL);
 
 
        ldb = ldb_init(NULL);