diff options
author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2012-01-16 17:47:02 -0500 |
---|---|---|
committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2012-01-16 17:47:02 -0500 |
commit | 925c48d7209e1a06c043428628cf434c52e423d0 (patch) | |
tree | f510f8665444f60349984e151a8f071965263fef /src/wrap.c | |
parent | e1870da882132ffab396910d061046c376e22e34 (diff) | |
download | slapi-nis-925c48d7209e1a06c043428628cf434c52e423d0.tar.gz slapi-nis-925c48d7209e1a06c043428628cf434c52e423d0.tar.xz slapi-nis-925c48d7209e1a06c043428628cf434c52e423d0.zip |
- set the TXN correctly, and don't bother with the internal helper that doesn't know how to use transactions
Diffstat (limited to 'src/wrap.c')
-rw-r--r-- | src/wrap.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -280,11 +280,11 @@ wrap_pblock_new(Slapi_PBlock *parent) void *txn; slapi_pblock_get(parent, SLAPI_PARENT_TXN, &txn); if (txn != NULL) { - slapi_pblock_set(ret, SLAPI_PARENT_TXN, &txn); + slapi_pblock_set(ret, SLAPI_PARENT_TXN, txn); } slapi_pblock_get(parent, SLAPI_TXN, &txn); if (txn != NULL) { - slapi_pblock_set(ret, SLAPI_TXN, &txn); + slapi_pblock_set(ret, SLAPI_TXN, txn); } } #endif @@ -300,12 +300,6 @@ wrap_search_internal_get_entry(Slapi_PBlock *parent_pb, int ret; *ret_entry = NULL; -#ifdef HAVE_SLAPI_SEARCH_INTERNAL_GET_ENTRY - if (filter == NULL) { - return slapi_search_internal_get_entry(dn, attrs, - ret_entry, caller_id); - } -#endif pb = wrap_pblock_new(parent_pb); if (pb == NULL) { return -1; |