Nope... that's the substr variant

diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c
index cb36d25a7dd389ce3797c7400eb586918c73cd9a..b7ee1c66d2c658ab811f740dca115e9ea675dac0 100644 (file)
--- a/src/lib/unlang/compile.c
+++ b/src/lib/unlang/compile.c
@@ -522,7 +522,7 @@ static bool pass2_fixup_undefined(CONF_ITEM const *ci, vp_tmpl_t *vpt, vp_tmpl_r
 
        rad_assert(vpt->type == TMPL_TYPE_ATTR_UNDEFINED);
 
-       if (fr_dict_attr_by_qualified_name(&da, rules->dict_def, vpt->tmpl_unknown_name, true) <= 0) {
+       if (fr_dict_attr_by_qualified_name(&da, rules->dict_def, vpt->tmpl_unknown_name, true) != FR_DICT_ATTR_OK) {
                ssize_t slen;
                fr_dict_attr_t *unknown_da;
 

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index 3816b054dcbfa51544a4855fbe53d9e7714a6582..5a528e78dc6b3132e811562d1e45bea8ed2f9307 100644 (file)
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -546,7 +546,7 @@ VALUE_PAIR *fr_pair_make(TALLOC_CTX *ctx, fr_dict_t const *dict, VALUE_PAIR **vp
         *      It's not found in the dictionary, so we use
         *      another method to create the attribute.
         */
-       if (fr_dict_attr_by_qualified_name(&da, dict, attrname, true) <= 0) {
+       if (fr_dict_attr_by_qualified_name(&da, dict, attrname, true) != FR_DICT_ATTR_OK) {
                if (tag != TAG_NONE) {
                        fr_strerror_printf("Invalid tag for attribute %s", attribute);
                        return NULL;

diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c
index e9a92753136d785495a114b5259e0f358df8a015..08bd8f9fd9f6a5551114f2999ea0c1ad2bd7c370 100644 (file)
--- a/src/modules/rlm_detail/rlm_detail.c
+++ b/src/modules/rlm_detail/rlm_detail.c
@@ -186,7 +186,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf)
                        attr = cf_pair_attr(cf_item_to_pair(ci));
                        if (!attr) continue; /* pair-anoia */
 
-                       if (fr_dict_attr_by_qualified_name(&da, dict_radius, attr, false) <= 0) {
+                       if (fr_dict_attr_by_qualified_name(&da, dict_radius, attr, false) != FR_DICT_ATTR_OK) {
                                cf_log_perr(conf, "Failed resolving attribute");
                                return -1;
                        }

diff --git a/src/modules/rlm_passwd/rlm_passwd.c b/src/modules/rlm_passwd/rlm_passwd.c
index dd504678d055ea07657ff427d8f2775071ec35d3..c8e76814a5b319058318e195fae125d216e30c6a 100644 (file)
--- a/src/modules/rlm_passwd/rlm_passwd.c
+++ b/src/modules/rlm_passwd/rlm_passwd.c
@@ -479,7 +479,8 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf)
                return -1;
        }
 
-       if (fr_dict_attr_by_qualified_name(&da, dict_freeradius, inst->pwd_fmt->field[key_field], true) <= 0) {
+       if (fr_dict_attr_by_qualified_name(&da, dict_freeradius,
+                                          inst->pwd_fmt->field[key_field], true) != FR_DICT_ATTR_OK) {
                PERROR("Unable to resolve attribute");
                release_ht(inst->ht);
                inst->ht = NULL;

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 135fa9180cc3630d823a779fe282ff984305bcdb..d5fe05a9c854a8f5dd5b7fbaccaafcbe2500bc20 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -1059,7 +1059,8 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf)
                        goto error;
                }
 
-               if (fr_dict_attr_by_qualified_name(&inst->group_da, dict_freeradius, group_attribute, false) <= 0) {
+               if (fr_dict_attr_by_qualified_name(&inst->group_da, dict_freeradius,
+                                                  group_attribute, false) != FR_DICT_ATTR_OK) {
                        PERROR("Failed resolving group attribute");
                        goto error;
                }

diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c
index 327de1aa0fbb350e1f103fe00402b213b21009d8..e368a2a5c212a59bbf72a926ee84a13f2ff2b5dc 100644 (file)
--- a/src/modules/rlm_sqlippool/rlm_sqlippool.c
+++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c
@@ -421,7 +421,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf)
        }
 
        if (fr_dict_attr_by_qualified_name(&inst->framed_ip_address,
-                                          dict_freeradius, inst->attribute_name, false) < 0) {
+                                          dict_freeradius, inst->attribute_name, false) != FR_DICT_ATTR_OK) {
                cf_log_perr(conf, "Failed resolving attribute");
                return -1;
        }