Fix prev commit

[openldap] / servers / slapd / filter.c

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 0f17a9cb8484ca775695ac3909c17bb9790d4805..5d671ab77cb1d8f98b6bbdac94641632b8e0b62c 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -201,6 +201,18 @@ get_filter(
 
                if( err != LDAP_SUCCESS ) {
                        /* unrecognized attribute description or other error */
+#ifdef NEW_LOGGING
+                       LDAP_LOG( FILTER, ERR, 
+                               "get_filter: conn %d unknown attribute "
+                               "type=%s (%d)\n",
+                               op->o_connid, type.bv_val, err );
+#else
+                       Debug( LDAP_DEBUG_ANY, 
+                               "get_filter: conn %d unknown attribute "
+                               "type=%s (%d)\n",
+                               op->o_connid, type.bv_val, err );
+#endif
+
                        f.f_choice = SLAPD_FILTER_COMPUTED;
                        f.f_result = LDAP_COMPARE_FALSE;
                        err = LDAP_SUCCESS;
@@ -423,6 +435,16 @@ get_ssa(
        rc = slap_bv2ad( &desc, &ssa.sa_desc, text );
 
        if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( FILTER, ERR, 
+                       "get_ssa: conn %d d unknown attribute type=%s (%d)\n",
+                       op->o_connid, desc.bv_val, rc );
+#else
+               Debug( LDAP_DEBUG_ANY, 
+                       "get_ssa: conn %d unknown attribute type=%s (%d)\n",
+                       op->o_connid, desc.bv_val, rc );
+#endif
+
                /* skip over the rest of this filter */
                for ( tag = ber_first_element( ber, &len, &last );
                        tag != LBER_DEFAULT;
@@ -669,16 +691,18 @@ filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
 {
        int             i;
        Filter          *p;
-       struct berval   tmp,
+       struct berval   tmp;
+       static struct berval
                        ber_bvfalse = BER_BVC( "(?=false)" ),
                        ber_bvtrue = BER_BVC( "(?=true)" ),
                        ber_bvundefined = BER_BVC( "(?=undefined)" ),
                        ber_bverror = BER_BVC( "(?=error)" ),
-                       ber_bvunknown = BER_BVC( "(?=unknown)" );
+                       ber_bvunknown = BER_BVC( "(?=unknown)" ),
+                       ber_bvnone = BER_BVC( "(?=none)" );
        ber_len_t       len;
 
        if ( f == NULL ) {
-               ber_str2bv_x( "No filter!", sizeof("No filter!")-1, 1, fstr, op->o_tmpmemctx );
+               ber_dupbv_x( fstr, &ber_bvnone, op->o_tmpmemctx );
                return;
        }
 
@@ -1031,6 +1055,18 @@ get_simple_vrFilter(
 
                if( err != LDAP_SUCCESS ) {
                        /* unrecognized attribute description or other error */
+#ifdef NEW_LOGGING
+                       LDAP_LOG( FILTER, ERR, 
+                               "get_simple_vrFilter: conn %d unknown "
+                               "attribute type=%s (%d)\n",
+                               op->o_connid, type.bv_val, err );
+#else
+                       Debug( LDAP_DEBUG_ANY, 
+                               "get_simple_vrFilter: conn %d unknown "
+                               "attribute type=%s (%d)\n",
+                               op->o_connid, type.bv_val, err );
+#endif
+
                        vrf.vrf_choice = SLAPD_FILTER_COMPUTED;
                        vrf.vrf_result = LDAP_COMPARE_FALSE;
                        err = LDAP_SUCCESS;