- expect a parent pblock when we're pulling up a single entry

2 files changed, 7 insertions, 5 deletions

diff --git a/src/wrap.c b/src/wrap.c
index 99c6860..1dbd4b5 100644
--- a/src/wrap.c
+++ b/src/wrap.c
@@ -275,7 +275,7 @@ wrap_pblock_new(Slapi_PBlock *parent)
 	Slapi_PBlock *ret;
 
 	ret = slapi_pblock_new();
-#ifdef defined(SLAPI_TXN) && defined(SLAPI_PARENT_TXN)
+#if defined(SLAPI_TXN) && defined(SLAPI_PARENT_TXN)
 	if (ret != NULL) {
 		void *txn;
 		slapi_pblock_get(parent, SLAPI_TXN, &txn);
@@ -288,7 +288,8 @@ wrap_pblock_new(Slapi_PBlock *parent)
 }
 
 int
-wrap_search_internal_get_entry(Slapi_DN *dn, char *filter, char **attrs,
+wrap_search_internal_get_entry(Slapi_PBlock *parent_pb,
+			       Slapi_DN *dn, char *filter, char **attrs,
 			       Slapi_Entry **ret_entry, void *caller_id)
 {
 	Slapi_PBlock *pb;
@@ -301,7 +302,7 @@ wrap_search_internal_get_entry(Slapi_DN *dn, char *filter, char **attrs,
 						       ret_entry, caller_id);
 	}
 #endif
-	pb = slapi_pblock_new();
+	pb = wrap_pblock_new(parent_pb);
 	if (pb == NULL) {
 		return -1;
 	}
diff --git a/src/wrap.h b/src/wrap.h
index 9fff5e5..7fd85e7 100644
--- a/src/wrap.h
+++ b/src/wrap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008,2010 Red Hat, Inc.
+ * Copyright 2008,2010,2012 Red Hat, Inc.
  *
  * This Program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,7 +38,8 @@ void wrap_rwlock_wrlock(struct wrapped_rwlock *rwlock);
 void wrap_rwlock_unlock(struct wrapped_rwlock *rwlock);
 
 Slapi_PBlock *wrap_pblock_new(Slapi_PBlock *parent);
-int wrap_search_internal_get_entry(Slapi_DN *dn, char *filter, char **attrs,
+int wrap_search_internal_get_entry(Slapi_PBlock *pb,
+				   Slapi_DN *dn, char *filter, char **attrs,
 				   Slapi_Entry **ret_entry, void *caller_id);
 int wrap_get_call_level(void);
 int wrap_inc_call_level(void);