Add a new configuration directive, base_filter which is used for base scope searches

(When searching for the default/regular profiles for example)

diff --git a/doc/rlm_ldap b/doc/rlm_ldap
index d6bb623..c28a9a6 100644 (file)
--- a/doc/rlm_ldap
+++ b/doc/rlm_ldap
@@ -95,6 +95,11 @@ the rlm_ldap module:
 #      
 #      default: filter   = "(uid=%u)"
 
+#      base_filter: The LDAP search filter used for base scope searches, like
+#      when searching for the default or regular profiles
+#
+#      deafault: base_filter = "(objectclass=radiusprofile)"
+
 #      default_profile: DN of a LDAP object, which contains default RADIUS
 #      attributes.  default: NULL - use only user specific attributes or
 #      attributes, supplied by other modules.

diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index 85c9fbf..fc805d5 100644 (file)
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -826,6 +826,7 @@ modules {
                # password = mypass
                basedn = "o=My Org,c=UA"
                filter = "(uid=%{Stripped-User-Name:-%{User-Name}})"
+               # base_filter = "(objectclass=radiusprofile)"
 
                # set this to 'yes' to use TLS encrypted connections
                # to the LDAP database by using the StartTLS extended

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 24c00a0..9e47897 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -134,6 +134,9 @@
  *     - In case of a bad search filter, print out the corresponding filter
  * Sep 2003, Kostas Kalevras <kkalev@noc.ntua.gr>
  *     - Compile even if we don't have pthread's
+ * Oct 2003, Kostas Kalevras <kkalev@noc.ntua.gr>
+ *     - Add a new configuration directive, base_filter which is used for base scope searches
+ *       (When searching for the default/regular profiles for example)
  */
 static const char rcsid[] = "$Id$";
 
@@ -242,6 +245,7 @@ typedef struct {
        char           *login;
        char           *password;
        char           *filter;
+       char           *base_filter;
        char           *basedn;
        char           *default_profile;
        char           *profile_attr;
@@ -274,6 +278,7 @@ static CONF_PARSER module_config[] = {
        {"password", PW_TYPE_STRING_PTR, offsetof(ldap_instance,password), NULL, ""},
        {"basedn", PW_TYPE_STRING_PTR, offsetof(ldap_instance,basedn), NULL, "o=notexist"},
        {"filter", PW_TYPE_STRING_PTR, offsetof(ldap_instance,filter), NULL, "(uid=%u)"},
+       {"base_filter", PW_TYPE_STRING_PTR, offsetof(ldap_instance,base_filter), NULL, "(objectclass=radiusprofile)"},
        {"default_profile", PW_TYPE_STRING_PTR, offsetof(ldap_instance,default_profile), NULL, NULL},
        {"profile_attribute", PW_TYPE_STRING_PTR, offsetof(ldap_instance,profile_attr), NULL, NULL},
        {"password_header", PW_TYPE_STRING_PTR, offsetof(ldap_instance,passwd_hdr), NULL, NULL},
@@ -1151,7 +1156,7 @@ ldap_authorize(void *instance, REQUEST * request)
        if (inst->default_profile || user_profile){
                char *profile = inst->default_profile;
 
-               strNcpy(filter,"(objectclass=radiusprofile)",sizeof(filter));
+               strNcpy(filter,inst->base_filter,sizeof(filter));
                if (user_profile)
                        profile = user_profile->strvalue;
                if (profile && strlen(profile)){
@@ -1186,7 +1191,7 @@ ldap_authorize(void *instance, REQUEST * request)
        if (inst->profile_attr){
                if ((vals = ldap_get_values(conn->ld, msg, inst->profile_attr)) != NULL) {
                        unsigned int i=0;
-                       strNcpy(filter,"(objectclass=radiusprofile)",sizeof(filter));
+                       strNcpy(filter,inst->base_filter,sizeof(filter));
                        while(vals[i] != NULL && strlen(vals[i])){
                                if ((res = perform_search(instance, conn,
                                        vals[i], LDAP_SCOPE_BASE, 
@@ -1594,6 +1599,8 @@ ldap_detach(void *instance)
                free(inst->dictionary_mapping);
        if (inst->filter)
                free((char *) inst->filter);
+       if (inst->base_filter)
+               free((char *) inst->base_filter);
        if (inst->passwd_hdr)
                free((char *) inst->passwd_hdr);
        if (inst->passwd_attr)