From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat, 1 Dec 2012 19:33:57 +0000 (+0000)
Subject: Rename groupmemb_filt
X-Git-Tag: release_3_0_0_beta1~1452
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3a3067e79ce28979d03aeb56914939d6f07eae1;p=thirdparty%2Ffreeradius-server.git

Rename groupmemb_filt
---

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index a3402f7e249..8077d13cdad 100644
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -84,7 +84,7 @@ typedef struct {
 	 *	Group checking.
 	 */
 	char	       *groupname_attr;
-	char	       *groupmemb_filt;
+	char	       *groupmemb_filter;
 	char		*groupmemb_attr;
 
 	/*
@@ -180,7 +180,7 @@ static CONF_PARSER group_config[] = {
 	{"name_attribute", PW_TYPE_STRING_PTR,
 	 offsetof(ldap_instance,groupname_attr), NULL, "cn"},
 	{"membership_filter", PW_TYPE_STRING_PTR,
-	 offsetof(ldap_instance,groupmemb_filt), NULL, "(|(&(objectClass=GroupOfNames)(member=%{Ldap-UserDn}))(&(objectClass=GroupOfUniqueNames)(uniquemember=%{Ldap-UserDn})))"},
+	 offsetof(ldap_instance,groupmemb_filter), NULL, "(|(&(objectClass=GroupOfNames)(member=%{Ldap-UserDn}))(&(objectClass=GroupOfUniqueNames)(uniquemember=%{Ldap-UserDn})))"},
 	{"membership_attribute", PW_TYPE_STRING_PTR,
 	 offsetof(ldap_instance,groupmemb_attr), NULL, NULL},
 
@@ -1032,10 +1032,10 @@ static int ldap_groupcmp(void *instance, REQUEST *request,
 		return 1;
 	}
 
-	if (!inst->groupmemb_filt) goto check_attr;
+	if (!inst->groupmemb_filter) goto check_attr;
 
 	if (!radius_xlat(gr_filter, sizeof(gr_filter),
-			 inst->groupmemb_filt, request, ldap_escape_func, NULL)) {
+			 inst->groupmemb_filter, request, ldap_escape_func, NULL)) {
 		RDEBUG("Failed creating group filter");
 		return 1;
 	}