From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 11 Dec 2012 22:17:13 +0000 (+0000)
Subject: Ignore right operand for !*
X-Git-Tag: release_3_0_0_beta1~1374
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d62f6655286bcc5d6a7a5689ba8889c13e98f299;p=thirdparty%2Ffreeradius-server.git

Ignore right operand for !*
---

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 7ef55eebe1e..37f2caa1d23 100644
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -2201,7 +2201,6 @@ static int user_modify(ldap_instance *inst, REQUEST *request,
 	     ci != NULL;
 	     ci = cf_item_find_next(cs, ci)) {
 	     	int do_xlat = FALSE;
-	     	int is_wildcard = FALSE;
 	     	
 	     	if (total == MAX_ATTRMAP) {
 	     		radlog(L_ERR, "rlm_ldap (%s): Modify map size exceeded",
@@ -2232,22 +2231,10 @@ static int user_modify(ldap_instance *inst, REQUEST *request,
 			
 			continue;
 		}
-		
+
 		switch (cf_pair_value_type(cp))
 		{
 			case T_BARE_WORD:
-				if (strcmp(value, "ANY") == 0) {
-					if (op != T_OP_CMP_FALSE) {
-						radlog(L_ERR, "rlm_ldap (%s): "
-						       "ANY is only supported "
-						       "for !* operators",
-						       inst->xlat_name);
-						
-						goto error;	
-					}
-					
-					is_wildcard = TRUE;
-				}
 			case T_SINGLE_QUOTED_STRING:
 			break;
 			case T_BACK_QUOTED_STRING:
@@ -2259,10 +2246,9 @@ static int user_modify(ldap_instance *inst, REQUEST *request,
 				goto error;
 		}
 		
-		/* 
-		 *	Will be xlat expanded
-		 */
-		if (do_xlat) {
+		if (op == T_OP_CMP_FALSE) {
+			passed[last_pass] = NULL;
+		} else if (do_xlat) {
 			p = rad_malloc(1024);
 			radius_xlat(p, 1024, value, request, NULL, NULL);
 			
@@ -2278,12 +2264,6 @@ static int user_modify(ldap_instance *inst, REQUEST *request,
 			
 			expanded[last_exp++] = p;
 			passed[last_pass] = p;
-		/* 
-		 *	The ANY keyword used as a wildcard
-		 */
-		} else if (is_wildcard) {
-			passed[last_pass] = NULL;
-			
 		/* 
 		 *	Static strings
 		 */
@@ -2311,8 +2291,6 @@ static int user_modify(ldap_instance *inst, REQUEST *request,
 				mod_s[total].mod_op = LDAP_MOD_REPLACE;
 			break;
 			case T_OP_SUB:
-				mod_s[total].mod_op = LDAP_MOD_DELETE;
-			break;
 			case T_OP_CMP_FALSE:
 				mod_s[total].mod_op = LDAP_MOD_DELETE;
 			break;