other->invalid

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 08fc1da9ed9d2caaf535f52f2b40a3f6813447ad..9c6f222902437e9f2968dba6fd3269f7efae4845 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -310,8 +310,8 @@ inValidate(
        Syntax *syntax,
        struct berval *in )
 {
-       /* any value allowed */
-       return LDAP_OTHER;
+       /* no value allowed */
+       return LDAP_INVALID_SYNTAX;
 }
 
 static int
@@ -776,7 +776,8 @@ approxMatch(
        }
 
        /* Yes, this is necessary */
-       assertv = UTF8bvnormalize( ((struct berval *)assertedValue), NULL, LDAP_UTF8_APPROX );
+       assertv = UTF8bvnormalize( ((struct berval *)assertedValue),
+               NULL, LDAP_UTF8_APPROX );
        if( assertv == NULL ) {
                ber_bvfree( nval );
                *matchp = 1;
@@ -933,7 +934,8 @@ approxFilter(
        BerVarray keys;
 
        /* Yes, this is necessary */
-       val = UTF8bvnormalize( ((struct berval *)assertValue), NULL, LDAP_UTF8_APPROX );
+       val = UTF8bvnormalize( ((struct berval *)assertValue),
+               NULL, LDAP_UTF8_APPROX );
        if( val == NULL || val->bv_val == NULL ) {
                keys = (struct berval *)ch_malloc( sizeof(struct berval) );
                keys[0].bv_val = NULL;