From d2de5b33f60dc4413a04b2b8a782fbf5d6263635 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@dahyabhai.net>
Date: Wed, 11 Jan 2012 10:40:59 -0500
Subject: - have slapi_search_internal_get_entry() always set its result to
 NULL on failure

---
 src/back-nis.c | 1 +
 src/back-shr.c | 3 +--
 src/format.c   | 4 +---
 src/wrap.c     | 3 ++-
 4 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/back-nis.c b/src/back-nis.c
index c3ad42a..dbe81ce 100644
--- a/src/back-nis.c
+++ b/src/back-nis.c
@@ -744,6 +744,7 @@ backend_update_params(struct plugin_state *state)
 	Slapi_Entry *our_entry;
 	char *tmp, **tmpv;
 	int i;
+
 	our_dn = slapi_sdn_new_dn_byval(state->plugin_base);
 	if (our_dn == NULL) {
 		slapi_log_error(SLAPI_LOG_PLUGIN,
diff --git a/src/back-shr.c b/src/back-shr.c
index b34797d..d328810 100644
--- a/src/back-shr.c
+++ b/src/back-shr.c
@@ -75,6 +75,7 @@ backend_shr_read_server_name(struct plugin_state *state, char **master)
 	char *attrs[] = {"nsslapd-localhost", NULL}, *actual_attr;
 	const char *cvalue;
 	int disposition, buffer_flags;
+
 	*master = NULL;
 	/* Try to read our name from the top-level configuration node. */
 	config_dn = slapi_sdn_new_dn_byval("cn=config");
@@ -85,7 +86,6 @@ backend_shr_read_server_name(struct plugin_state *state, char **master)
 				"error parsing \"cn=config\"\n");
 		return -1;
 	}
-	config = NULL;
 	wrap_search_internal_get_entry(config_dn, NULL, attrs, &config,
 				       state->plugin_identity);
 	if (config == NULL) {
@@ -293,7 +293,6 @@ backend_shr_set_config_entry_set_one_dn(struct plugin_state *state,
 				"error parsing DN \"%s\"\n", dn);
 		return;
 	} else {
-		entry = NULL;
 		wrap_search_internal_get_entry(sdn, NULL, NULL, &entry,
 					       state->plugin_identity);
 		if (entry == NULL) {
diff --git a/src/format.c b/src/format.c
index cb014eb..5df48d2 100644
--- a/src/format.c
+++ b/src/format.c
@@ -290,8 +290,8 @@ format_check_entry(const char *dn, char *filter, void *identity)
 {
 	Slapi_DN *sdn;
 	Slapi_Entry *entry;
+
 	sdn = slapi_sdn_new_dn_byval(dn);
-	entry = NULL;
 	wrap_search_internal_get_entry(sdn, filter, NULL, &entry, identity);
 	slapi_sdn_free(&sdn);
 	if (entry != NULL) {
@@ -1057,7 +1057,6 @@ format_deref_x(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 					"\"%s\"\n", fname, cref);
 			continue;
 		}
-		ref = NULL;
 		wrap_search_internal_get_entry(refdn, filter, attrs, &ref,
 					       state->plugin_identity);
 		if (ref == NULL) {
@@ -1269,7 +1268,6 @@ format_deref_rx(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 					    &list->links[i].base_sdn_list2,
 					    slapi_dn_parent(dn));
 			/* Pull up the named entry. */
-			entry = NULL;
 			wrap_search_internal_get_entry(these[j],
 						       NULL,
 						       attrs, &entry,
diff --git a/src/wrap.c b/src/wrap.c
index e0bfdbe..327212c 100644
--- a/src/wrap.c
+++ b/src/wrap.c
@@ -293,13 +293,14 @@ wrap_search_internal_get_entry(Slapi_DN *dn, char *filter, char **attrs,
 {
 	Slapi_PBlock *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
-	*ret_entry = NULL;
 	pb = slapi_pblock_new();
 	if (pb == NULL) {
 		return -1;
-- 
cgit