diff options
| author | Simo Sorce <idra@samba.org> | 2008-12-22 15:54:56 -0500 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2008-12-22 18:52:48 -0500 |
| commit | 41718e315ea78998fab0893fd5f148a49d8faab8 (patch) | |
| tree | ecbc13fb3abce56481ba04e13d9aa1b69b19783b /ldb/ldb_map | |
| parent | a93a69380dc6718c49879af628ed69f8e2b70797 (diff) | |
| download | sssd-41718e315ea78998fab0893fd5f148a49d8faab8.tar.gz sssd-41718e315ea78998fab0893fd5f148a49d8faab8.tar.bz2 sssd-41718e315ea78998fab0893fd5f148a49d8faab8.zip | |
Rebase ldb code with all changes in samba master
Diffstat (limited to 'ldb/ldb_map')
| -rw-r--r-- | ldb/ldb_map/ldb_map.c | 4 | ||||
| -rw-r--r-- | ldb/ldb_map/ldb_map_outbound.c | 2 | ||||
| -rw-r--r-- | ldb/ldb_map/ldb_map_private.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/ldb/ldb_map/ldb_map.c b/ldb/ldb_map/ldb_map.c index fafbb63b..72d8378a 100644 --- a/ldb/ldb_map/ldb_map.c +++ b/ldb/ldb_map/ldb_map.c @@ -626,7 +626,7 @@ static struct ldb_val ldb_dn_convert_local(struct ldb_module *module, void *mem_ struct ldb_dn *dn, *newdn; struct ldb_val newval; - dn = ldb_dn_new(mem_ctx, module->ldb, (char *)val->data); + dn = ldb_dn_from_ldb_val(mem_ctx, module->ldb, val); if (! ldb_dn_validate(dn)) { newval.length = 0; newval.data = NULL; @@ -652,7 +652,7 @@ static struct ldb_val ldb_dn_convert_remote(struct ldb_module *module, void *mem struct ldb_dn *dn, *newdn; struct ldb_val newval; - dn = ldb_dn_new(mem_ctx, module->ldb, (char *)val->data); + dn = ldb_dn_from_ldb_val(mem_ctx, module->ldb, val); if (! ldb_dn_validate(dn)) { newval.length = 0; newval.data = NULL; diff --git a/ldb/ldb_map/ldb_map_outbound.c b/ldb/ldb_map/ldb_map_outbound.c index 5f524a8b..5588eaaf 100644 --- a/ldb/ldb_map/ldb_map_outbound.c +++ b/ldb/ldb_map/ldb_map_outbound.c @@ -1077,7 +1077,7 @@ int map_return_entry(struct map_context *ac, struct ldb_reply *ares) } } - return ldb_module_send_entry(ac->req, ares->message); + return ldb_module_send_entry(ac->req, ares->message, ares->controls); } /* Search a record. */ diff --git a/ldb/ldb_map/ldb_map_private.h b/ldb/ldb_map/ldb_map_private.h index 55221253..0543ba71 100644 --- a/ldb/ldb_map/ldb_map_private.h +++ b/ldb/ldb_map/ldb_map_private.h @@ -86,3 +86,5 @@ int map_return_fatal_error(struct ldb_request *req, int map_return_normal_error(struct ldb_request *req, struct ldb_reply *ares, int error); + +int map_return_entry(struct map_context *ac, struct ldb_reply *ares); |