Remove remaining tmpl_t from rlm_ldap_t

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index ecad4eb4866a0f1e41092d53c19d5dd7eb582d35..79bf085ede7f515566071ea0444ec9805aeafd27 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -85,9 +85,7 @@ static const call_env_t autz_profile_call_env[] = {
  *     User configuration
  */
 static CONF_PARSER user_config[] = {
-       { FR_CONF_OFFSET("filter", FR_TYPE_TMPL, rlm_ldap_t, userobj_filter) },
        { FR_CONF_OFFSET("scope", FR_TYPE_STRING, rlm_ldap_t, userobj_scope_str), .dflt = "sub" },
-       { FR_CONF_OFFSET("base_dn", FR_TYPE_TMPL, rlm_ldap_t, userobj_base_dn), .dflt = "", .quote = T_SINGLE_QUOTED_STRING },
        { FR_CONF_OFFSET("sort_by", FR_TYPE_STRING, rlm_ldap_t, userobj_sort_by) },
 
        { FR_CONF_OFFSET("access_attribute", FR_TYPE_STRING, rlm_ldap_t, userobj_access_attr) },
@@ -119,7 +117,6 @@ user_call_env(memberof, ldap_memberof_call_env_t);
 static CONF_PARSER group_config[] = {
        { FR_CONF_OFFSET("filter", FR_TYPE_STRING, rlm_ldap_t, groupobj_filter) },
        { FR_CONF_OFFSET("scope", FR_TYPE_STRING, rlm_ldap_t, groupobj_scope_str), .dflt = "sub" },
-       { FR_CONF_OFFSET("base_dn", FR_TYPE_TMPL, rlm_ldap_t, groupobj_base_dn), .dflt = "", .quote = T_SINGLE_QUOTED_STRING },
 
        { FR_CONF_OFFSET("name_attribute", FR_TYPE_STRING, rlm_ldap_t, groupobj_name_attr), .dflt = "cn" },
        { FR_CONF_OFFSET("membership_attribute", FR_TYPE_STRING, rlm_ldap_t, userobj_membership_attr) },

diff --git a/src/modules/rlm_ldap/rlm_ldap.h b/src/modules/rlm_ldap/rlm_ldap.h
index 2414d65f3b67974dcf1c59c75ce7341dd395e247..f9ca698a10def80cd02e79f901c88ff00144b9b9 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.h
+++ b/src/modules/rlm_ldap/rlm_ldap.h
@@ -44,8 +44,6 @@ typedef struct {
        /*
         *      User object attributes and filters
         */
-       tmpl_t  *userobj_filter;                //!< Filter to retrieve only user objects.
-       tmpl_t  *userobj_base_dn;               //!< DN to search for users under.
        char const      *userobj_scope_str;             //!< Scope (sub, one, base).
        char const      *userobj_sort_by;               //!< List of attributes to sort by.
        LDAPControl     *userobj_sort_ctrl;             //!< Server side sort control.
@@ -65,7 +63,6 @@ typedef struct {
         *      Group object attributes and filters
         */
        char const      *groupobj_filter;               //!< Filter to retrieve only group objects.
-       tmpl_t  *groupobj_base_dn;              //!< DN to search for users under.
        char const      *groupobj_scope_str;            //!< Scope (sub, one, base).
        int             groupobj_scope;                 //!< Search scope.