diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 15:18:05 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 15:18:05 +0100 |
| commit | 47951fc5d0085e124666b7667715bba98076820e (patch) | |
| tree | 67216ad0d594eb5a7238327c386ba34594142118 /source3/lib/ldb/tools/ad2oLschema.c | |
| parent | d3199276eac8caa55c8334458d156fd4badae338 (diff) | |
| download | samba-47951fc5d0085e124666b7667715bba98076820e.tar.gz samba-47951fc5d0085e124666b7667715bba98076820e.tar.bz2 samba-47951fc5d0085e124666b7667715bba98076820e.zip | |
Reorder arguments to ldb_search() to match what is in Samba 4.
Diffstat (limited to 'source3/lib/ldb/tools/ad2oLschema.c')
| -rw-r--r-- | source3/lib/ldb/tools/ad2oLschema.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/source3/lib/ldb/tools/ad2oLschema.c b/source3/lib/ldb/tools/ad2oLschema.c index fc51cb12d8..55406b29be 100644 --- a/source3/lib/ldb/tools/ad2oLschema.c +++ b/source3/lib/ldb/tools/ad2oLschema.c @@ -84,9 +84,8 @@ static int fetch_attrs_schema(struct ldb_context *ldb, struct ldb_dn *schemadn, } /* Downlaod schema */ - ret = ldb_search(ldb, schemadn, LDB_SCOPE_SUBTREE, - "objectClass=attributeSchema", - attrs, attrs_res); + ret = ldb_search(ldb, ldb, attrs_res, schemadn, LDB_SCOPE_SUBTREE, + attrs, "objectClass=attributeSchema"); if (ret != LDB_SUCCESS) { printf("Search failed: %s\n", ldb_errstring(ldb)); return LDB_ERR_OPERATIONS_ERROR; @@ -122,9 +121,8 @@ static int fetch_oc_recursive(struct ldb_context *ldb, struct ldb_dn *schemadn, char *filter = talloc_asprintf(mem_ctx, "(&(&(objectClass=classSchema)(subClassOf=%s))(!(lDAPDisplayName=%s)))", name, name); - ret = ldb_search(ldb, schemadn, LDB_SCOPE_SUBTREE, - filter, - oc_attrs, &res); + ret = ldb_search(ldb, ldb, &res, schemadn, LDB_SCOPE_SUBTREE, + oc_attrs, filter); talloc_free(filter); if (ret != LDB_SUCCESS) { printf("Search failed: %s\n", ldb_errstring(ldb)); @@ -165,9 +163,8 @@ static int fetch_objectclass_schema(struct ldb_context *ldb, struct ldb_dn *sche } /* Downlaod 'top' */ - ret = ldb_search(ldb, schemadn, LDB_SCOPE_SUBTREE, - "(&(objectClass=classSchema)(lDAPDisplayName=top))", - oc_attrs, &top_res); + ret = ldb_search(ldb, ldb, &top_res, schemadn, LDB_SCOPE_SUBTREE, + oc_attrs, "(&(objectClass=classSchema)(lDAPDisplayName=top))"); if (ret != LDB_SUCCESS) { printf("Search failed: %s\n", ldb_errstring(ldb)); return LDB_ERR_OPERATIONS_ERROR; @@ -207,7 +204,7 @@ static struct ldb_dn *find_schema_dn(struct ldb_context *ldb, TALLOC_CTX *mem_ct } /* Search for rootdse */ - ldb_ret = ldb_search(ldb, basedn, LDB_SCOPE_BASE, NULL, rootdse_attrs, &rootdse_res); + ldb_ret = ldb_search(ldb, ldb, &rootdse_res, basedn, LDB_SCOPE_BASE, rootdse_attrs, NULL); if (ldb_ret != LDB_SUCCESS) { printf("Search failed: %s\n", ldb_errstring(ldb)); return NULL; |