- make the newly-multiple-choice deref and referred functions return errors

  when they fail to find answers in multiple-choice situations, so that we
  don't end up with empty strings

1 files changed, 32 insertions, 7 deletions

diff --git a/src/format.c b/src/format.c
index bc64a6c..2b20305 100644
--- a/src/format.c
+++ b/src/format.c
@@ -530,7 +530,11 @@ format_deref(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 				   0, &ref_buffer_flags) != 0) {
 		/* No references. */
 		format_free_parsed_args(argv);
-		return 0;
+		if (outbuf_choices == NULL) {
+			return 0;
+		} else {
+			return -ENOENT;
+		}
 	}
 	/* Retrieve these attributes from the referred-to entries. */
 	attrs[0] = ref_attr;
@@ -567,6 +571,10 @@ format_deref(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 			slapi_sdn_free(&refdn);
 			continue;
 		}
+		slapi_log_error(SLAPI_LOG_PLUGIN,
+				state->plugin_desc->spd_id,
+				"deref: reading \"%s\" from \"%s\"\n",
+				target_attr, slapi_sdn_get_ndn(refdn));
 		slapi_sdn_free(&refdn);
 		/* Pull out the attribute from the referred-to entry. */
 		if (slapi_vattr_values_get(ref, target_attr, &values,
@@ -641,9 +649,15 @@ format_deref(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 				&actual_ref_attr,
 				ref_buffer_flags);
 	format_free_parsed_args(argv);
-	if (choices != NULL) {
-		format_add_choice(outbuf_choices, outbuf, choices);
-		backend_shr_free_strlist(choices);
+	if (outbuf_choices != NULL) {
+		if (choices != NULL) {
+			/* Return the values we found. */
+			format_add_choice(outbuf_choices, outbuf, choices);
+			backend_shr_free_strlist(choices);
+		} else {
+			/* Return a no-result error. */
+			ret = -ENOENT;
+		}
 	}
 	return ret;
 }
@@ -874,9 +888,16 @@ format_referred(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 	}
 	free(tndn);
 
-	if ((outbuf_choices != NULL) && (cbdata.choices != NULL)) {
-		format_add_choice(outbuf_choices, outbuf, cbdata.choices);
-		backend_shr_free_strlist(cbdata.choices);
+	if (outbuf_choices != NULL) {
+		if (cbdata.choices != NULL) {
+			/* Return the values we found. */
+			format_add_choice(outbuf_choices, outbuf,
+					  cbdata.choices);
+			backend_shr_free_strlist(cbdata.choices);
+		} else {
+			/* Return a no-result error. */
+			cbdata.ret = -ENOENT;
+		}
 	}
 
 	backend_free_set_config(set_bases, set_filter);
@@ -2149,6 +2170,10 @@ format_get_data_set(struct plugin_state *state, Slapi_Entry *e,
 		}
 		combinations *= this_choice->n_values;
 	}
+	if (combinations == 0) {
+		format_free_choices(choices);
+		return NULL;
+	}
 	template_len = strlen(template);
 	ret = malloc((combinations + 1) * sizeof(char *));
 	if (ret != NULL) {