@@ -107,10 +107,6 @@ TMPL_REQUEST_REF_DEF(tmpl_request_def_parent, REQUEST_PARENT);
107107 if (!t_rules) { \
108108 t_rules = &default_rules; \
109109 default_rules.attr.prefix = TMPL_ATTR_REF_PREFIX_AUTO; \
110- } else if (t_rules->attr.prefix == TMPL_ATTR_REF_PREFIX_YES) { \
111- default_rules = *t_rules; \
112- default_rules.attr.prefix = TMPL_ATTR_REF_PREFIX_AUTO; \
113- t_rules = &default_rules; \
114110 } \
115111 } while (0)
116112
@@ -2250,28 +2246,9 @@ ssize_t tmpl_afrom_attr_substr(TALLOC_CTX *ctx, tmpl_attr_error_t *err,
22502246 }
22512247
22522248 /*
2253- * Check to see if we expect a reference prefix
2249+ * '&' prefix is ignored.
22542250 */
2255- switch (at_rules -> prefix ) {
2256- case TMPL_ATTR_REF_PREFIX_YES :
2257- fr_assert (0 );
2258- break ;
2259-
2260- case TMPL_ATTR_REF_PREFIX_AUTO :
2261- /*
2262- * '&' prefix can be there, but doesn't have to be
2263- */
2264- (void ) fr_sbuff_next_if_char (& our_name , '&' );
2265- break ;
2266-
2267- case TMPL_ATTR_REF_PREFIX_NO :
2268- if (fr_sbuff_is_char (& our_name , '&' )) {
2269- fr_strerror_const ("Attribute references used here must not have a '&' prefix" );
2270- if (err ) * err = TMPL_ATTR_ERROR_BAD_PREFIX ;
2271- FR_SBUFF_ERROR_RETURN (& our_name );
2272- }
2273- break ;
2274- }
2251+ (void ) fr_sbuff_next_if_char (& our_name , '&' );
22752252
22762253 /*
22772254 * We parsed the tmpl as User-Name, but NOT %{User-Name}.
0 commit comments