r21496: A number of ldb control and LDAP changes, surrounding the
[kamenim/samba.git] / source4 / lib / ldb / tools / ldbsearch.c
index 3c36d3be143ff1ffce073726219fce063dcc4e77..e5b9091b5cc806b4f3e4e35afda35d687b2454aa 100644 (file)
@@ -54,94 +54,219 @@ static int do_compare_msg(struct ldb_message **el1,
                          struct ldb_message **el2,
                          void *opaque)
 {
-       struct ldb_context *ldb = talloc_get_type(opaque, struct ldb_context);
-       return ldb_dn_compare(ldb, (*el1)->dn, (*el2)->dn);
+       return ldb_dn_compare((*el1)->dn, (*el2)->dn);
+}
+
+struct search_context {
+       struct ldb_control **req_ctrls;
+
+       int sort;
+       int num_stored;
+       struct ldb_message **store;
+       char **refs_store;
+
+       int entries;
+       int refs;
+
+       int pending;
+       int status;
+};
+
+static int store_message(struct ldb_message *msg, struct search_context *sctx) {
+
+       sctx->store = talloc_realloc(sctx, sctx->store, struct ldb_message *, sctx->num_stored + 2);
+       if (!sctx->store) {
+               fprintf(stderr, "talloc_realloc failed while storing messages\n");
+               return -1;
+       }
+
+       sctx->store[sctx->num_stored] = talloc_move(sctx->store, &msg);
+       sctx->num_stored++;
+       sctx->store[sctx->num_stored] = NULL;
+
+       return 0;
+}
+
+static int store_referral(char *referral, struct search_context *sctx) {
+
+       sctx->refs_store = talloc_realloc(sctx, sctx->refs_store, char *, sctx->refs + 2);
+       if (!sctx->refs_store) {
+               fprintf(stderr, "talloc_realloc failed while storing referrals\n");
+               return -1;
+       }
+
+       sctx->refs_store[sctx->refs] = talloc_move(sctx->refs_store, &referral);
+       sctx->refs++;
+       sctx->refs_store[sctx->refs] = NULL;
+
+       return 0;
+}
+
+static int display_message(struct ldb_context *ldb, struct ldb_message *msg, struct search_context *sctx) {
+       struct ldb_ldif ldif;
+
+       sctx->entries++;
+       printf("# record %d\n", sctx->entries);
+
+       ldif.changetype = LDB_CHANGETYPE_NONE;
+       ldif.msg = msg;
+
+               if (sctx->sort) {
+       /*
+        * Ensure attributes are always returned in the same
+        * order.  For testing, this makes comparison of old
+        * vs. new much easier.
+        */
+               ldb_msg_sort_elements(ldif.msg);
+               }
+
+       ldb_ldif_write_file(ldb, stdout, &ldif);
+
+       return 0;
+}
+
+static int display_referral(char *referral, struct search_context *sctx)
+{
+
+       sctx->refs++;
+       printf("# Referral\nref: %s\n\n", referral);
+
+       return 0;
+}
+
+static int search_callback(struct ldb_context *ldb, void *context, struct ldb_reply *ares)
+{
+       struct search_context *sctx = talloc_get_type(context, struct search_context);
+       int ret;
+       
+       switch (ares->type) {
+
+       case LDB_REPLY_ENTRY:
+               if (sctx->sort) {
+                       ret = store_message(ares->message, sctx);
+               } else {
+                       ret = display_message(ldb, ares->message, sctx);
+               }
+               break;
+
+       case LDB_REPLY_REFERRAL:
+               if (sctx->sort) {
+                       ret = store_referral(ares->referral, sctx);
+               } else {
+                       ret = display_referral(ares->referral, sctx);
+               }
+               break;
+
+       case LDB_REPLY_DONE:
+               if (ares->controls) {
+                       if (handle_controls_reply(ares->controls, sctx->req_ctrls) == 1)
+                               sctx->pending = 1;
+               }
+               ret = 0;
+               break;
+               
+       default:
+               fprintf(stderr, "unknown Reply Type\n");
+               return LDB_ERR_OTHER;
+       }
+
+       if (talloc_free(ares) == -1) {
+               fprintf(stderr, "talloc_free failed\n");
+               sctx->pending = 0;
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       if (ret) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       return LDB_SUCCESS;
 }
 
 static int do_search(struct ldb_context *ldb,
-                    const struct ldb_dn *basedn,
+                    struct ldb_dn *basedn,
                     struct ldb_cmdline *options,
                     const char *expression,
                     const char * const *attrs)
 {
-       int ret, i, n;
-       int loop = 0;
-       int total = 0;
-       int refs = 0;
        struct ldb_request *req;
-       struct ldb_result *result = NULL;
+       struct search_context *sctx;
+       int ret;
 
        req = talloc(ldb, struct ldb_request);
-       req->operation = LDB_REQ_SEARCH;
+       if (!req) return -1;
+       
+       sctx = talloc(req, struct search_context);
+       if (!sctx) return -1;
+
+       sctx->sort = options->sorted;
+       sctx->num_stored = 0;
+       sctx->store = NULL;
+       sctx->req_ctrls = ldb_parse_control_strings(ldb, sctx, (const char **)options->controls);
+       if (options->controls != NULL &&  sctx->req_ctrls== NULL) {
+               printf("parsing controls failed: %s\n", ldb_errstring(ldb));
+               return -1;
+       }
+       sctx->entries = 0;
+       sctx->refs = 0;
+
+       if (basedn == NULL) {
+               basedn = ldb_get_default_basedn(ldb);
+       }
+
+       req->operation = LDB_SEARCH;
        req->op.search.base = basedn;
        req->op.search.scope = options->scope;
-       req->op.search.tree = ldb_parse_tree(ldb, expression);
+       req->op.search.tree = ldb_parse_tree(req, expression);
        if (req->op.search.tree == NULL) return -1;
        req->op.search.attrs = attrs;
-       req->op.search.res = NULL;
-       req->controls = parse_controls(ldb, options->controls);
-       if (options->controls != NULL && req->controls == NULL) return -1;
-       req->creds = NULL;
-
-       do {
-               loop = 0;
-
-               ret = ldb_request(ldb, req);
-               if (ret != LDB_SUCCESS) {
-                       printf("search failed - %s\n", ldb_errstring(ldb));
-                       return -1;
-               }
+       req->controls = sctx->req_ctrls;
+       req->context = sctx;
+       req->callback = &search_callback;
+       ldb_set_timeout(ldb, req, 0); /* TODO: make this settable by command line */
 
-               result = req->op.search.res;
+again:
+       sctx->pending = 0;
 
-               if (options->sorted) {
-                       ldb_qsort(result->msgs, result->count, sizeof(struct ldb_message *),
-                                 ldb, (ldb_qsort_cmp_fn_t)do_compare_msg);
-               }
+       ret = ldb_request(ldb, req);
+       if (ret != LDB_SUCCESS) {
+               printf("search failed - %s\n", ldb_errstring(ldb));
+               return -1;
+       }
 
-               for (i = 0; i < result->count; i++, total++) {
-                       struct ldb_ldif ldif;
-                       printf("# record %d\n", total + 1);
-
-                       ldif.changetype = LDB_CHANGETYPE_NONE;
-                       ldif.msg = result->msgs[i];
-
-                       if (options->sorted) {
-                               /*
-                                * Ensure attributes are always returned in the same
-                                * order.  For testing, this makes comparison of old
-                                * vs. new much easier.
-                                */
-                               ldb_msg_sort_elements(ldif.msg);
-                       }
-       
-                       ldb_ldif_write_file(ldb, stdout, &ldif);
-               }
+       ret = ldb_wait(req->handle, LDB_WAIT_ALL);
+               if (ret != LDB_SUCCESS) {
+               printf("search error - %s\n", ldb_errstring(ldb));
+               return -1;
+       }
 
-               if (result->refs) {
-                       for(n = 0;result->refs[n]; n++, refs++) {
-                               printf("# referral %d\nref: %s\n\n", refs + 1, result->refs[n]);
-                       }
+       if (sctx->pending)
+               goto again;
+
+       if (sctx->sort && sctx->num_stored != 0) {
+               int i;
+
+               ldb_qsort(sctx->store, ret, sizeof(struct ldb_message *),
+                         ldb, (ldb_qsort_cmp_fn_t)do_compare_msg);
+
+               if (ret != 0) {
+                       fprintf(stderr, "An error occurred while sorting messages\n");
+                       exit(1);
                }
-               
-               if (result->controls) {
-                       if (handle_controls_reply(result->controls, req->controls) == 1)
-                               loop = 1;
+
+               for (i = 0; i < sctx->num_stored; i++) {
+                       display_message(ldb, sctx->store[i], sctx);
                }
 
-               if (result) {
-                       ret = talloc_free(result);
-                       if (ret == -1) {
-                               fprintf(stderr, "talloc_free failed\n");
-                               exit(1);
-                       }
+               for (i = 0; i < sctx->refs; i++) {
+                       display_referral(sctx->refs_store[i], sctx);
                }
+       }
 
-               req->op.search.res = NULL;
-               
-       } while(loop);
+       printf("# returned %d records\n# %d entries\n# %d referrals\n",
+               sctx->entries + sctx->refs, sctx->entries, sctx->refs);
 
-       printf("# returned %d records\n# %d entries\n# %d referrals\n", total + refs, total, refs);
+       talloc_free(req);
 
        return 0;
 }
@@ -175,8 +300,8 @@ int main(int argc, const char **argv)
        }
 
        if (options->basedn != NULL) {
-               basedn = ldb_dn_explode(ldb, options->basedn);
-               if (basedn == NULL) {
+               basedn = ldb_dn_new(ldb, ldb, options->basedn);
+               if ( ! ldb_dn_validate(basedn)) {
                        fprintf(stderr, "Invalid Base DN format\n");
                        exit(1);
                }