Make up the right dependencies now that ldb depends on libevents

[metze/samba/wip.git] / source / lib / ldb / tools / ldbdel.c

diff --git a/source/lib/ldb/tools/ldbdel.c b/source/lib/ldb/tools/ldbdel.c
index 6082931e2292ed627fe2d145a22d5a2a6d6bf60c..e66d4fb973ec83aa17469231e7bc48d2fff2a071 100644 (file)
--- a/source/lib/ldb/tools/ldbdel.c
+++ b/source/lib/ldb/tools/ldbdel.c
@@ -10,7 +10,7 @@
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   version 3 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,8 +18,7 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
@@ -32,26 +31,20 @@
  *  Author: Andrew Tridgell
  */
 
-#include "includes.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_private.h"
-#include "ldb/tools/cmdline.h"
+#include "ldb_includes.h"
+#include "tools/cmdline.h"
 
-#ifdef _SAMBA_BUILD_
-#include "system/filesys.h"
-#endif
-
-static int ldb_delete_recursive(struct ldb_context *ldb, const struct ldb_dn *dn)
+static int ldb_delete_recursive(struct ldb_context *ldb, struct ldb_dn *dn)
 {
        int ret, i, total=0;
-       const char *attrs[] = { "dn", NULL };
-       struct ldb_message **res;
+       const char *attrs[] = { NULL };
+       struct ldb_result *res;
        
-       ret = ldb_search(ldb, dn, LDB_SCOPE_SUBTREE, "dn=*", attrs, &res);
-       if (ret <= 0) return -1;
+       ret = ldb_search(ldb, dn, LDB_SCOPE_SUBTREE, "distinguishedName=*", attrs, &res);
+       if (ret != LDB_SUCCESS) return -1;
 
-       for (i=0;i<ret;i++) {
-               if (ldb_delete(ldb, res[i]->dn) == 0) {
+       for (i = 0; i < res->count; i++) {
+               if (ldb_delete(ldb, res->msgs[i]->dn) == 0) {
                        total++;
                }
        }
@@ -78,13 +71,13 @@ static void usage(void)
        exit(1);
 }
 
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
 {
        struct ldb_context *ldb;
-       int ret, i;
+       int ret = 0, i;
        struct ldb_cmdline *options;
 
-       ldb = ldb_init(NULL);
+       ldb = ldb_init(NULL, NULL);
 
        options = ldb_cmdline_process(ldb, argc, argv, usage);
 
@@ -94,10 +87,10 @@ static void usage(void)
        }
 
        for (i=0;i<options->argc;i++) {
-               const struct ldb_dn *dn;
+               struct ldb_dn *dn;
 
-               dn = ldb_dn_explode(ldb, options->argv[i]);
-               if (dn == NULL) {
+               dn = ldb_dn_new(ldb, ldb, options->argv[i]);
+               if ( ! ldb_dn_validate(dn)) {
                        printf("Invalid DN format\n");
                        exit(1);
                }
@@ -111,12 +104,12 @@ static void usage(void)
                }
                if (ret != 0) {
                        printf("delete of '%s' failed - %s\n",
-                               ldb_dn_linearize(ldb, dn),
+                               ldb_dn_get_linearized(dn),
                                ldb_errstring(ldb));
                }
        }
 
        talloc_free(ldb);
 
-       return 0;
+       return ret;
 }