diff options
Diffstat (limited to 'src/format.c')
| -rw-r--r-- | src/format.c | 149 |
1 files changed, 110 insertions, 39 deletions
diff --git a/src/format.c b/src/format.c index 698ea34..9871ac6 100644 --- a/src/format.c +++ b/src/format.c @@ -1,5 +1,5 @@ /* - * Copyright 2008,2010,2011 Red Hat, Inc. + * Copyright 2008,2010,2011,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 @@ -62,7 +62,7 @@ static int format_expand(struct plugin_state *state, const char *fmt, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, - char ***ref_attrs, + char ***rel_attrs, char ***ref_attrs, struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list); @@ -918,6 +918,7 @@ format_first(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, + char ***rel_attrs, char ***ref_attrs, struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) @@ -948,7 +949,7 @@ format_first(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, ret = -ENOENT; values = format_get_data_set(state, e, group, set, value_format, disallowed, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list, &lengths); if (values == NULL) { @@ -965,7 +966,7 @@ format_first(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, default_value, NULL, outbuf, outbuf_len, outbuf_choices, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list); ret = i; } @@ -1005,6 +1006,7 @@ format_deref_x(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, char *filter, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, + char ***rel_attrs, char ***ref_attrs, struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) @@ -1019,6 +1021,10 @@ format_deref_x(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *cref; const struct berval *val; struct berval **choices; + /* Note that this map cares about this attribute. */ + if (rel_attrs != NULL) { + format_add_attrlist(rel_attrs, ref_attr); + } /* Note that the attribute in this entry refers to other entries. */ if (ref_attrs != NULL) { format_add_attrlist(ref_attrs, ref_attr); @@ -1067,6 +1073,10 @@ format_deref_x(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, "%s: reading \"%s\" from \"%s\"\n", fname, target_attr, slapi_sdn_get_ndn(refdn)); slapi_sdn_free(&refdn); + /* Note that this map cares about this attribute. */ + if (rel_attrs != NULL) { + format_add_attrlist(rel_attrs, target_attr); + } /* Pull out the attribute from the referred-to entry. */ if (slapi_vattr_values_get(ref, target_attr, &values, &disposition, &actual_attr, @@ -1106,6 +1116,7 @@ format_deref(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, + char ***rel_attrs, char ***ref_attrs, struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) @@ -1136,7 +1147,7 @@ format_deref(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, ret = format_deref_x(state, pb, e, "deref", group, set, ref_attr, target_attr, NULL, disallowed, outbuf, outbuf_len, outbuf_choices, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list); format_free_parsed_args(argv); return ret; @@ -1148,7 +1159,8 @@ format_deref_f(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, - char ***ref_attrs, struct format_inref_attr ***inref_attrs, + char ***rel_attrs, char ***ref_attrs, + struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { @@ -1179,7 +1191,7 @@ format_deref_f(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, ret = format_deref_x(state, pb, e, "deref_f", group, set, ref_attr, target_attr, filter, disallowed, outbuf, outbuf_len, outbuf_choices, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list); format_free_parsed_args(argv); return ret; @@ -1196,7 +1208,8 @@ format_deref_rx(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, - char ***ref_attrs, struct format_inref_attr ***inref_attrs, + char ***rel_attrs, char ***ref_attrs, + struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { @@ -1212,6 +1225,13 @@ format_deref_rx(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, struct berval **choices; struct format_ref_attr_list *list; + /* Note that this map cares about all of these attributes. */ + if ((rel_attrs != NULL) && (attributes != NULL)) { + for (i = 0; attributes[i] != NULL; i++) { + format_add_attrlist(rel_attrs, attributes[i]); + } + } + /* Note that this list of attributes is used for pulling up data. */ format_add_ref_attr_list(ref_attr_list, group, set, attributes, filters); @@ -1351,6 +1371,7 @@ format_deref_r(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, + char ***rel_attrs, char ***ref_attrs, struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) @@ -1382,7 +1403,7 @@ format_deref_r(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, disallowed, outbuf, outbuf_len, outbuf_choices, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list); format_free_parsed_args(argv); return ret; @@ -1394,6 +1415,7 @@ format_deref_rf(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, + char ***rel_attrs, char ***ref_attrs, struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) @@ -1451,7 +1473,7 @@ format_deref_rf(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, disallowed, outbuf, outbuf_len, outbuf_choices, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list); free(filters); free(attrs); @@ -1519,7 +1541,8 @@ format_referred(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, - char ***ref_attrs, struct format_inref_attr ***inref_attrs, + char ***rel_attrs, char ***ref_attrs, + struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { @@ -1581,6 +1604,12 @@ format_referred(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, return -ENOENT; } + /* Note that this map cares both attributes. */ + if (rel_attrs != NULL) { + format_add_attrlist(rel_attrs, other_attr); + format_add_attrlist(rel_attrs, attr); + } + /* Note that the attribute in this map refers to this entry. */ if (inref_attrs != NULL) { format_add_inref_attrs(inref_attrs, group, @@ -1726,6 +1755,7 @@ format_referred_r(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, + char ***rel_attrs, char ***ref_attrs, struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) @@ -1788,6 +1818,14 @@ format_referred_r(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, } attr_links[i] = NULL; + /* Note that this map cares about these attributes. */ + if (rel_attrs != NULL) { + format_add_attrlist(rel_attrs, attr); + for (i = 0; attr_links[i] != NULL; i++) { + format_add_attrlist(rel_attrs, attr_links[i]); + } + } + /* Note this list of attributes. */ format_add_ref_attr_list(inref_attr_list, group, set, attr_links, NULL); list = format_find_ref_attr_list(*inref_attr_list, group, set, @@ -1964,7 +2002,8 @@ format_merge(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, - char ***ref_attrs, struct format_inref_attr ***inref_attrs, + char ***rel_attrs, char ***ref_attrs, + struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { @@ -1993,7 +2032,7 @@ format_merge(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, "merge: expanding ->%s<-\n", argv[i]); values = format_get_data_set(state, e, group, set, argv[i], disallowed, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list, &lengths); if (values == NULL) { @@ -2048,6 +2087,7 @@ format_match_generic(struct plugin_state *state, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, + char ***rel_attrs, char ***ref_attrs, struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, @@ -2080,7 +2120,7 @@ format_match_generic(struct plugin_state *state, lengths = NULL; values = format_get_data_set(state, e, group, set, argv[0], disallowed, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list, &lengths); if (values != NULL) { @@ -2134,6 +2174,7 @@ format_match_generic(struct plugin_state *state, group, set, argv[default_arg], disallowed, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, @@ -2240,14 +2281,15 @@ format_match(struct plugin_state *state, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, - char ***ref_attrs, struct format_inref_attr ***inref_attrs, + char ***rel_attrs, char ***ref_attrs, + struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { return format_match_generic(state, pb, e, group, set, args, 2, 2, disallowed, outbuf, outbuf_len, outbuf_choices, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list, "format_match", format_match_cb); } @@ -2280,14 +2322,15 @@ format_regmatch(struct plugin_state *state, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, - char ***ref_attrs, struct format_inref_attr ***inref_attrs, + char ***rel_attrs, char ***ref_attrs, + struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { return format_match_generic(state, pb, e, group, set, args, 2, 2, disallowed, outbuf, outbuf_len, outbuf_choices, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list, "format_regmatch", format_regmatch_cb); } @@ -2303,14 +2346,15 @@ format_regmatchi(struct plugin_state *state, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, - char ***ref_attrs, struct format_inref_attr ***inref_attrs, + char ***rel_attrs, char ***ref_attrs, + struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { return format_match_generic(state, pb, e, group, set, args, 2, 2, disallowed, outbuf, outbuf_len, outbuf_choices, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list, "format_regmatchi", format_regmatchi_cb); } @@ -2436,14 +2480,15 @@ format_regsub(struct plugin_state *state, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, - char ***ref_attrs, struct format_inref_attr ***inref_attrs, + char ***rel_attrs, char ***ref_attrs, + struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { return format_match_generic(state, pb, e, group, set, args, 3, 3, disallowed, outbuf, outbuf_len, outbuf_choices, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list, "format_regsub", format_regsub_cb); } @@ -2459,14 +2504,15 @@ format_regsubi(struct plugin_state *state, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, - char ***ref_attrs, struct format_inref_attr ***inref_attrs, + char ***rel_attrs, char ***ref_attrs, + struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { return format_match_generic(state, pb, e, group, set, args, 3, 3, disallowed, outbuf, outbuf_len, outbuf_choices, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list, "format_regsubi", format_regsubi_cb); } @@ -2482,7 +2528,8 @@ format_ifeq(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, - char ***ref_attrs, struct format_inref_attr ***inref_attrs, + char ***rel_attrs, char ***ref_attrs, + struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { @@ -2513,10 +2560,15 @@ format_ifeq(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, return -EINVAL; } + /* Note that this map cares about the tested attribute. */ + if (rel_attrs != NULL) { + format_add_attrlist(rel_attrs, argv[0]); + } + /* Evaluate the value expression to get a list of candidate values. */ values = format_get_data_set(state, e, group, set, argv[1], disallowed, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list, &lengths); if (values == NULL) { @@ -2556,7 +2608,7 @@ format_ifeq(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, argv[matched ? 2 : 3], disallowed, outbuf, outbuf_len, outbuf_choices, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list); format_free_parsed_args(argv); return ret; @@ -2570,7 +2622,8 @@ format_collect(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, - char ***ref_attrs, struct format_inref_attr ***inref_attrs, + char ***rel_attrs, char ***ref_attrs, + struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { @@ -2598,7 +2651,7 @@ format_collect(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, /* Evaluate this argument. */ values = format_get_data_set(state, e, group, set, argv[i], disallowed, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list, &lengths); if (values != NULL) { @@ -2663,7 +2716,8 @@ format_link(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, - char ***ref_attrs, struct format_inref_attr ***inref_attrs, + char ***rel_attrs, char ***ref_attrs, + struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { @@ -2713,6 +2767,7 @@ format_link(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, "link: evaluating \"%s\"\n", argv[i]); values[i / 3] = format_get_data_set(state, e, group, set, argv[i], disallowed, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list, @@ -2858,6 +2913,7 @@ format_lookup_fn(const char *fnname) const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, + char ***rel_attrs, char ***ref_attrs, struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, @@ -2951,7 +3007,7 @@ format_check_disallowed(const struct berval *bv, const char *disallowed) static struct berval format_single(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *attr, const char *disallowed, - struct berval ***values) + char ***attrlist, struct berval ***values) { Slapi_ValueSet *value_set; Slapi_Value *value; @@ -2960,6 +3016,9 @@ format_single(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const struct berval *val; struct berval bv; int count, disposition, buffer_flags, i; + if (attrlist != NULL) { + format_add_attrlist(attrlist, attr); + } memset(&bv, 0, sizeof(bv)); if (slapi_vattr_values_get(e, (char *) attr, &value_set, &disposition, &actual_attr, @@ -3189,6 +3248,7 @@ format_expand_simple(struct plugin_state *state, const char *fmt, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, + char ***rel_attrs, char ***ref_attrs, struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, @@ -3285,7 +3345,7 @@ format_expand_simple(struct plugin_state *state, /* Retrieve the value. */ values = NULL; tmp = format_single(state, pb, e, attribute, disallowed, - outbuf_choices ? &values : NULL); + rel_attrs, outbuf_choices ? &values : NULL); if (tmp.bv_val == NULL) { /* The attribute is undefined, or we're treating it as if it * is. */ @@ -3298,6 +3358,7 @@ format_expand_simple(struct plugin_state *state, default_value, NULL, outbuf, outbuf_len, outbuf_choices, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list); @@ -3316,6 +3377,7 @@ format_expand_simple(struct plugin_state *state, alternate_value, NULL, outbuf, outbuf_len, outbuf_choices, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list); @@ -3343,7 +3405,7 @@ format_expand_simple(struct plugin_state *state, i = format_expand(state, pb, e, group, set, alternate_value, NULL, outbuf, outbuf_len, outbuf_choices, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list); free(tmp.bv_val); free(expr); @@ -3382,7 +3444,8 @@ format_expand(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *fmt, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, - char ***ref_attrs, struct format_inref_attr ***inref_attrs, + char ***rel_attrs, char ***ref_attrs, + struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { @@ -3396,6 +3459,7 @@ format_expand(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *args, const char *disallowed, char *outbuf, int outbuf_len, struct format_choice **outbuf_choices, + char ***rel_attrs, char ***ref_attrs, struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, @@ -3456,6 +3520,7 @@ format_expand(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, outbuf + j, outbuf_len - j, outbuf_choices, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, @@ -3560,6 +3625,7 @@ format_expand(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, params, disallowed, outbuf + j, outbuf_len - j, outbuf_choices, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list); @@ -3617,7 +3683,8 @@ format_format(struct plugin_state *state, Slapi_Entry *e, const char *group, const char *set, const char *fmt, const char *disallowed, struct format_choice **choices, - char ***ref_attrs, struct format_inref_attr ***inref_attrs, + char ***rel_attrs, char ***ref_attrs, + struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list, unsigned int *data_length) @@ -3645,7 +3712,7 @@ format_format(struct plugin_state *state, Slapi_Entry *e, i = format_expand(state, pb, e, group, set, fmt, disallowed, buf, buflen, choices, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list); if ((i >= 0) && (i < buflen)) { buf[i] = '\0'; @@ -3705,6 +3772,7 @@ char * format_get_data(struct plugin_state *state, Slapi_Entry *e, const char *group, const char *set, const char *fmt, const char *disallowed, + char ***rel_attrs, char ***ref_attrs, struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, @@ -3712,8 +3780,10 @@ format_get_data(struct plugin_state *state, Slapi_Entry *e, unsigned int *data_length) { unsigned int ignored; - return format_format(state, e, group, set, fmt, disallowed, - NULL, ref_attrs, inref_attrs, + return format_format(state, e, group, set, fmt, + disallowed, NULL, + rel_attrs, + ref_attrs, inref_attrs, ref_attr_list, inref_attr_list, data_length ? data_length : &ignored); } @@ -3734,6 +3804,7 @@ char ** format_get_data_set(struct plugin_state *state, Slapi_Entry *e, const char *group, const char *set, const char *fmt, const char *disallowed, + char ***rel_attrs, char ***ref_attrs, struct format_inref_attr ***inref_attrs, struct format_ref_attr_list ***ref_attr_list, @@ -3748,7 +3819,7 @@ format_get_data_set(struct plugin_state *state, Slapi_Entry *e, choices = NULL; template = format_format(state, e, group, set, fmt, disallowed, &choices, - ref_attrs, inref_attrs, + rel_attrs, ref_attrs, inref_attrs, ref_attr_list, inref_attr_list, &template_len); if (template == NULL) { |