X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema_init.c;h=2455a2a1f33bba4d788f8e469e405a268ba254df;hb=8d0711b08f24e9084c816800d6e74be89c7a0a49;hp=df2f3157a3046ab2b1d3741fae0ad2ebc0428fed;hpb=b2a3ceb0022b339ef8cbb608c6a50d274b6a8f0c;p=openldap

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index df2f3157a3..2455a2a1f3 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -1,7 +1,7 @@
 /* schema_init.c - init builtin schema */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -59,7 +59,6 @@
 #define caseIgnoreOrderingMatch			caseIgnoreMatch
 #define caseExactOrderingMatch			caseExactMatch
 #define integerOrderingMatch			integerMatch
-#define	octetStringOrderingMatch		octetStringMatch
 
 /* unimplemented matching routines */
 #define caseIgnoreListMatch				NULL
@@ -138,6 +137,26 @@ octetStringMatch(
 	return LDAP_SUCCESS;
 }
 
+static int
+octetStringOrderingMatch(
+	int *matchp,
+	slap_mask_t flags,
+	Syntax *syntax,
+	MatchingRule *mr,
+	struct berval *value,
+	void *assertedValue )
+{
+	ber_len_t v_len  = value->bv_len;
+	ber_len_t av_len = ((struct berval *) assertedValue)->bv_len;
+	int match = memcmp( value->bv_val,
+		((struct berval *) assertedValue)->bv_val,
+		(v_len < av_len ? v_len : av_len) );
+	if( match == 0 )
+		match = v_len - av_len;
+	*matchp = match;
+	return LDAP_SUCCESS;
+}
+
 /* Index generation function */
 int octetStringIndexer(
 	slap_mask_t use,
@@ -295,46 +314,6 @@ bitStringValidate(
 	return LDAP_SUCCESS;
 }
 
-static int
-bitStringNormalize(
-	Syntax *syntax,
-	struct berval *val,
-	struct berval *normalized )
-{
-	/*
-	 * A normalized bitString is has no extaneous (leading) zero bits.
-	 * That is, '00010'B is normalized to '10'B
-	 * However, as a special case, '0'B requires no normalization.
-	 */
-	char *p;
-
-	/* start at the first bit */
-	p = &val->bv_val[1];
-
-	/* Find the first non-zero bit */
-	while ( *p == '0' ) p++;
-
-	if( *p == '\'' ) {
-		/* no non-zero bits */
-		ber_str2bv( "\'0\'B", sizeof("\'0\'B") - 1, 1, normalized );
-		goto done;
-	}
-
-	normalized->bv_val = ch_malloc( val->bv_len + 1 );
-
-	normalized->bv_val[0] = '\'';
-	normalized->bv_len = 1;
-
-	for( ; *p != '\0'; p++ ) {
-		normalized->bv_val[normalized->bv_len++] = *p;
-	}
-
-	normalized->bv_val[normalized->bv_len] = '\0';
-
-done:
-	return LDAP_SUCCESS;
-}
-
 static int
 nameUIDValidate(
 	Syntax *syntax,
@@ -386,53 +365,44 @@ nameUIDNormalize(
 
 	ber_dupbv( &out, val );
 	if( out.bv_len != 0 ) {
-		struct berval uidin = { 0, NULL };
-		struct berval uidout = { 0, NULL };
+		struct berval uid = { 0, NULL };
 
 		if( out.bv_val[out.bv_len-1] == 'B'
 			&& out.bv_val[out.bv_len-2] == '\'' )
 		{
 			/* assume presence of optional UID */
-			uidin.bv_val = strrchr( out.bv_val, '#' );
+			uid.bv_val = strrchr( out.bv_val, '#' );
 
-			if( uidin.bv_val == NULL ) {
+			if( uid.bv_val == NULL ) {
 				free( out.bv_val );
 				return LDAP_INVALID_SYNTAX;
 			}
 
-			uidin.bv_len = out.bv_len - (uidin.bv_val - out.bv_val);
-			out.bv_len -= uidin.bv_len--;
+			uid.bv_len = out.bv_len - (uid.bv_val - out.bv_val);
+			out.bv_len -= uid.bv_len--;
 
 			/* temporarily trim the UID */
-			*(uidin.bv_val++) = '\0';
-
-			rc = bitStringNormalize( syntax, &uidin, &uidout );
-
-			if( rc != LDAP_SUCCESS ) {
-				free( out.bv_val );
-				return LDAP_INVALID_SYNTAX;
-			}
+			*(uid.bv_val++) = '\0';
 		}
 
 		rc = dnNormalize2( NULL, &out, normalized );
 
 		if( rc != LDAP_SUCCESS ) {
 			free( out.bv_val );
-			free( uidout.bv_val );
 			return LDAP_INVALID_SYNTAX;
 		}
 
-		if( uidout.bv_len ) {
+		if( uid.bv_len ) {
 			normalized->bv_val = ch_realloc( normalized->bv_val,
-				normalized->bv_len + uidout.bv_len + sizeof("#") );
+				normalized->bv_len + uid.bv_len + sizeof("#") );
 
 			/* insert the separator */
 			normalized->bv_val[normalized->bv_len++] = '#';
 
 			/* append the UID */
 			AC_MEMCPY( &normalized->bv_val[normalized->bv_len],
-				uidout.bv_val, uidout.bv_len );
-			normalized->bv_len += uidout.bv_len;
+				uid.bv_val, uid.bv_len );
+			normalized->bv_len += uid.bv_len;
 
 			/* terminate */
 			normalized->bv_val[normalized->bv_len] = '\0';
@@ -3449,7 +3419,7 @@ objectIdentifierFirstComponentMatch(
 	int rc = LDAP_SUCCESS;
 	int match;
 	struct berval *asserted = (struct berval *) assertedValue;
-	ber_len_t i;
+	ber_len_t i, j;
 	struct berval oid;
 
 	if( value->bv_len == 0 || value->bv_val[0] != '(' /*')'*/ ) {
@@ -3463,8 +3433,8 @@ objectIdentifierFirstComponentMatch(
 
 	/* grab next word */
 	oid.bv_val = &value->bv_val[i];
-	oid.bv_len = value->bv_len - i;
-	for( i=1; ASCII_SPACE(value->bv_val[i]) && i < oid.bv_len; i++ ) {
+	j = value->bv_len - i;
+	for( i=0; !ASCII_SPACE(oid.bv_val[i]) && i < j; i++ ) {
 		/* empty */
 	}
 	oid.bv_len = i;
@@ -4294,7 +4264,7 @@ static slap_syntax_defs_rec syntax_defs[] = {
 		X_NOT_H_R ")",
 		SLAP_SYNTAX_BER, berValidate, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.6 DESC 'Bit String' )",
-		0, bitStringValidate, bitStringNormalize, NULL },
+		0, bitStringValidate, NULL, NULL },
 	{"( 1.3.6.1.4.1.1466.115.121.1.7 DESC 'Boolean' )",
 		0, booleanValidate, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.8 DESC 'Certificate' "