allow backwards compatibility for 'T' option (single char)

[openldap] / servers / slapd / ava.c

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index f24a03076ec2b09d5c7c41ba2d8895e2f8f756c9..57c79e794135f05840e87581ae2a2c8666191a3e 100644 (file)
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,8 +53,7 @@ get_ava(
        BerElement      *ber,
        AttributeAssertion      **ava,
        unsigned usage,
-       const char **text
-)
+       const char **text )
 {
        int rc;
        ber_tag_t rtag;
@@ -80,6 +79,13 @@ get_ava(
        rc = slap_bv2ad( &type, &aa->aa_desc, text );
 
        if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( FILTER, ERR,
+               "get_ava: unknown attributeType %s\n", type.bv_val, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_FILTER,
+               "get_ava: unknown attributeType %s\n", type.bv_val, 0, 0 );
+#endif
                op->o_tmpfree( aa, op->o_tmpmemctx );
                return rc;
        }
@@ -89,6 +95,13 @@ get_ava(
                usage, &value, &aa->aa_value, text, op->o_tmpmemctx );
 
        if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( FILTER, ERR,
+               "get_ava: illegal value for attributeType %s\n", type.bv_val, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_FILTER,
+               "get_ava: illegal value for attributeType %s\n", type.bv_val, 0, 0 );
+#endif
                op->o_tmpfree( aa, op->o_tmpmemctx );
                return rc;
        }