Rename vpt_types to tmpl_types

diff --git a/src/include/tmpl.h b/src/include/tmpl.h
index f34f7d1..34ddc5f 100644 (file)
--- a/src/include/tmpl.h
+++ b/src/include/tmpl.h
@@ -81,7 +81,7 @@ typedef enum tmpl_type {
        TMPL_TYPE_NULL                  //!< VPT has no value
 } tmpl_type_t;
 
-extern const FR_NAME_NUMBER vpt_types[];
+extern const FR_NAME_NUMBER tmpl_types[];
 
 typedef struct xlat_exp xlat_exp_t;
 

diff --git a/src/main/valuepair.c b/src/main/valuepair.c
index 7320e8f..7c9526d 100644 (file)
--- a/src/main/valuepair.c
+++ b/src/main/valuepair.c
@@ -34,7 +34,7 @@ RCSID("$Id$")
 #include <freeradius-devel/radiusd.h>
 #include <freeradius-devel/rad_assert.h>
 
-const FR_NAME_NUMBER vpt_types[] = {
+const FR_NAME_NUMBER tmpl_types[] = {
        {"unknown",             TMPL_TYPE_UNKNOWN },
        {"literal",             TMPL_TYPE_LITERAL },
        {"expanded",            TMPL_TYPE_XLAT },

diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 8e27d90..0e4114d 100644 (file)
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -518,7 +518,7 @@ static int cache_verify(rlm_cache_t *inst, value_pair_map_t **head)
                                           "allowed for %s values",
                                           fr_int2str(fr_tokens, map->op,
                                                      "<INVALID>"),
-                                          fr_int2str(vpt_types, map->rhs->type,
+                                          fr_int2str(tmpl_types, map->rhs->type,
                                                      "<INVALID>"));
                                return -1;
                        }

diff --git a/src/modules/rlm_ldap/attrmap.c b/src/modules/rlm_ldap/attrmap.c
index 62ad2d3..fb0dcf8 100644 (file)
--- a/src/modules/rlm_ldap/attrmap.c
+++ b/src/modules/rlm_ldap/attrmap.c
@@ -215,7 +215,7 @@ int rlm_ldap_map_verify(ldap_instance_t *inst, value_pair_map_t **head)
                        default:
                                cf_log_err(map->ci, "Operator \"%s\" not allowed for %s values",
                                           fr_int2str(fr_tokens, map->op, "<INVALID>"),
-                                          fr_int2str(vpt_types, map->rhs->type, "<INVALID>"));
+                                          fr_int2str(tmpl_types, map->rhs->type, "<INVALID>"));
                                return -1;
                        }
                default: