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/groupdb | |
| 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/groupdb')
| -rw-r--r-- | source3/groupdb/mapping_ldb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c index db3215552f..5c43af531f 100644 --- a/source3/groupdb/mapping_ldb.c +++ b/source3/groupdb/mapping_ldb.c @@ -221,7 +221,7 @@ static bool get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map) dn = mapping_dn(ldb, &sid); if (dn == NULL) goto failed; - ret = ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &res); + ret = ldb_search(ldb, ldb, &res, dn, LDB_SCOPE_BASE, NULL, NULL); talloc_steal(dn, res); if (ret != LDB_SUCCESS || res->count != 1) { goto failed; @@ -250,7 +250,7 @@ static bool get_group_map_from_gid(gid_t gid, GROUP_MAP *map) (unsigned)gid); if (expr == NULL) goto failed; - ret = ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res); + ret = ldb_search(ldb, ldb, &res, NULL, LDB_SCOPE_SUBTREE, NULL, expr); talloc_steal(expr, res); if (ret != LDB_SUCCESS || res->count != 1) goto failed; @@ -276,7 +276,7 @@ static bool get_group_map_from_ntname(const char *name, GROUP_MAP *map) expr = talloc_asprintf(ldb, "(&(ntName=%s)(objectClass=groupMap))", name); if (expr == NULL) goto failed; - ret = ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res); + ret = ldb_search(ldb, ldb, &res, NULL, LDB_SCOPE_SUBTREE, NULL, expr); talloc_steal(expr, res); if (ret != LDB_SUCCESS || res->count != 1) goto failed; @@ -341,7 +341,7 @@ static bool enum_group_mapping(const DOM_SID *domsid, enum lsa_SidType sid_name_ if (basedn == NULL) goto failed; } - ret = ldb_search(ldb, basedn, LDB_SCOPE_SUBTREE, expr, NULL, &res); + ret = ldb_search(ldb, ldb, &res, basedn, LDB_SCOPE_SUBTREE, NULL, expr); talloc_steal(tmp_ctx, res); if (ret != LDB_SUCCESS) goto failed; @@ -394,7 +394,7 @@ static NTSTATUS one_alias_membership(const DOM_SID *member, string_sid); if (expr == NULL) goto failed; - ret = ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, attrs, &res); + ret = ldb_search(ldb, ldb, &res, NULL, LDB_SCOPE_SUBTREE, attrs, expr); talloc_steal(expr, res); if (ret != LDB_SUCCESS) { goto failed; @@ -515,7 +515,7 @@ static NTSTATUS enum_aliasmem(const DOM_SID *alias, DOM_SID **sids, size_t *num) return NT_STATUS_NO_MEMORY; } - ret = ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, attrs, &res); + ret = ldb_search(ldb, ldb, &res, dn, LDB_SCOPE_BASE, attrs, NULL); talloc_steal(dn, res); if (ret == LDB_SUCCESS && res->count == 0) { talloc_free(dn); |