X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Flimits.c;h=c33726e71190b011a143de2f8a8eb210618142a3;hb=ef3d895cb80a5b0830817ffaa5dc0a92edd93723;hp=d9088ca8ac9a90b094dc8c67ee52b8f984017aa5;hpb=f74e81aa9973162cc455d48c6f9eb348a85a824f;p=openldap

diff --git a/servers/slapd/limits.c b/servers/slapd/limits.c
index d9088ca8ac..c33726e711 100644
--- a/servers/slapd/limits.c
+++ b/servers/slapd/limits.c
@@ -55,11 +55,11 @@ get_limits(
 				break;
 			}
 
-			d = ndn->bv_len - lm[0]->lm_dn_pat.bv_len;
 			/* ndn shorter than dn_pat */
-			if ( d < 0 ) {
+			if ( ndn->bv_len < lm[0]->lm_dn_pat.bv_len ) {
 				break;
 			}
+			d = ndn->bv_len - lm[0]->lm_dn_pat.bv_len;
 
 			/* allow exact match for SUBTREE only */
 			if ( d == 0 ) {
@@ -120,6 +120,10 @@ get_limits(
 			}
 			break;
 
+		case SLAP_LIMITS_ANY:
+			*limit = &lm[0]->lm_limits;
+			return( 0 );
+
 		default:
 			assert( 0 );	/* unreachable */
 			return( -1 );
@@ -179,6 +183,7 @@ add_limits(
 
 	case SLAP_LIMITS_ANONYMOUS:
 	case SLAP_LIMITS_USERS:
+	case SLAP_LIMITS_ANY:
 		lm->lm_type = type;
 		lm->lm_dn_pat.bv_val = NULL;
 		lm->lm_dn_pat.bv_len = 0;
@@ -264,7 +269,10 @@ parse_limits(
 	 */
 	
 	pattern = argv[1];
-	if ( strcasecmp( pattern, "anonymous" ) == 0 ) {
+	if ( strcmp( pattern, "*" ) == 0) {
+		type = SLAP_LIMITS_ANY;
+
+	} else if ( strcasecmp( pattern, "anonymous" ) == 0 ) {
 		type = SLAP_LIMITS_ANONYMOUS;
 
 	} else if ( strcasecmp( pattern, "users" ) == 0 ) {
@@ -342,6 +350,17 @@ parse_limits(
 
 			/* skip '=' (required) */
 			pattern++;
+
+			/* trim obvious cases */
+			if ( strcmp( pattern, "*" ) == 0 ) {
+				type = SLAP_LIMITS_ANY;
+				pattern = NULL;
+
+			} else if ( ( type == SLAP_LIMITS_REGEX || type == SLAP_LIMITS_UNDEFINED ) 
+					&& strcmp( pattern, ".*" ) == 0 ) {
+				type = SLAP_LIMITS_ANY;
+				pattern = NULL;
+			}
 		}
 	}