Need to include base filter when searching for groups

FreeRADIUS · Mar 23, 2013 · 0f20d91 · 0f20d91
1 parent 868f116
commit 0f20d91
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
@@ -348,9 +348,9 @@ static int rlm_ldap_groupcmp(void *instance, REQUEST *request, UNUSED VALUE_PAIR
 		strlcpy(filter, gr_filter, sizeof(filter));
 		strlcpy(basedn, check->vp_strvalue, sizeof(basedn));	
 	} else {
-		snprintf(filter, sizeof(filter), "(&(%s=%s)%s)",
+		snprintf(filter, sizeof(filter), "(&(%s=%s)%s%s)",
 			 inst->groupobj_name_attr,
-			 check->vp_strvalue, gr_filter);
+			 check->vp_strvalue, inst->base_filter, gr_filter);
 
 		/*
 		 *	rlm_ldap_find_user does this, too.  Oh well.