trace illegal condition in backsql_strfcat

[openldap] / servers / slapd / controls.c

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index b475dd1af44ef3789ebc49bfebbf9bf95934b67d..53d927004f8f109bfcb9142fb8d165a479ec0351 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -47,6 +47,9 @@ static SLAP_CTRL_PARSE_FN parseManageDSAit;
 static SLAP_CTRL_PARSE_FN parseSubentries;
 static SLAP_CTRL_PARSE_FN parseNoOp;
 static SLAP_CTRL_PARSE_FN parsePagedResults;
+static SLAP_CTRL_PARSE_FN parseValuesReturnFilter;
+
+#undef sc_mask /* avoid conflict with Irix 6.5 <sys/signal.h> */
 
 static struct slap_control {
        char *sc_oid;
@@ -72,6 +75,11 @@ static struct slap_control {
        { LDAP_CONTROL_PAGEDRESULTS_REQUEST,
                SLAP_CTRL_SEARCH, NULL,
                parsePagedResults },
+#endif
+#ifdef LDAP_CONTROL_VALUESRETURNFILTER
+       { LDAP_CONTROL_VALUESRETURNFILTER,
+               SLAP_CTRL_SEARCH, NULL,
+               parseValuesReturnFilter },
 #endif
        { NULL }
 };
@@ -126,8 +134,7 @@ int get_ctrls(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-               "get_ctrls: conn %lu\n", conn->c_connid ));
+       LDAP_LOG( OPERATION, ENTRY, "get_ctrls: conn %lu\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> get_ctrls\n", 0, 0, 0 );
 #endif
@@ -197,9 +204,8 @@ int get_ctrls(
 
                if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                               "get_ctrls: conn %lu get OID failed.\n",
-                               conn->c_connid ));
+                       LDAP_LOG( OPERATION, INFO, "get_ctrls: conn %lu get OID failed.\n",
+                               conn->c_connid, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get oid failed.\n",
                                0, 0, 0 );
@@ -219,9 +225,9 @@ int get_ctrls(
 
                        if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                                       "get_ctrls: conn %lu get crit failed.\n",
-                                       conn->c_connid ));
+                               LDAP_LOG( OPERATION, INFO, 
+                                       "get_ctrls: conn %lu get crit failed.\n", 
+                                       conn->c_connid, 0, 0 );
 #else
                                Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get crit failed.\n",
                                        0, 0, 0 );
@@ -242,11 +248,10 @@ int get_ctrls(
 
                        if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "get_ctrls: conn %lu: "
+                               LDAP_LOG( OPERATION, INFO, "get_ctrls: conn %lu: "
                                        "%s (%scritical): get value failed.\n",
-                                       conn->c_connid,
-                                       c->ldctl_oid ? c->ldctl_oid : "(NULL)",
-                                       c->ldctl_iscritical ? "" : "non" ));
+                                       conn->c_connid, c->ldctl_oid ? c->ldctl_oid : "(NULL)",
+                                       c->ldctl_iscritical ? "" : "non" );
 #else
                                Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: conn %lu: "
                                        "%s (%scritical): get value failed.\n",
@@ -263,11 +268,10 @@ int get_ctrls(
                }
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+               LDAP_LOG( OPERATION, INFO, 
                        "get_ctrls: conn %lu oid=\"%s\" (%scritical)\n",
-                       conn->c_connid,
-                       c->ldctl_oid ? c->ldctl_oid : "(NULL)",
-                       c->ldctl_iscritical ? "" : "non" ));
+                       conn->c_connid, c->ldctl_oid ? c->ldctl_oid : "(NULL)",
+                       c->ldctl_iscritical ? "" : "non" );
 #else
                Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: oid=\"%s\" (%scritical)\n",
                        c->ldctl_oid ? c->ldctl_oid : "(NULL)",
@@ -349,9 +353,8 @@ int get_ctrls(
 
 return_results:
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_RESULTS,
-               "get_ctrls: conn=%lu    n=%d rc=%d err=%s\n",
-               conn->c_connid, nctrls, rc, errmsg ? errmsg : "" ));
+       LDAP_LOG( OPERATION, RESULTS, 
+               "get_ctrls: n=%d rc=%d err=%s\n", nctrls, rc, errmsg ? errmsg : "" );
 #else
        Debug( LDAP_DEBUG_TRACE, "<= get_ctrls: n=%d rc=%d err=%s\n",
                nctrls, rc, errmsg ? errmsg : "");
@@ -527,3 +530,61 @@ static int parsePagedResults (
        return LDAP_SUCCESS;
 }
 #endif
+
+#ifdef LDAP_CONTROL_VALUESRETURNFILTER
+int parseValuesReturnFilter (
+       Connection *conn,
+       Operation *op,
+       LDAPControl *ctrl,
+       const char **text )
+{
+       int             rc;
+       BerElement      *ber;
+       struct berval   fstr = { 0, NULL };
+       const char *err_msg = "";
+
+       if ( op->o_valuesreturnfilter != SLAP_NO_CONTROL ) {
+               *text = "valuesreturnfilter control specified multiple times";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
+       ber = ber_init( &(ctrl->ldctl_value) );
+       if (ber == NULL) {
+               *text = "internal error";
+               return LDAP_OTHER;
+       }
+       
+       rc = get_vrFilter( conn, ber, &(op->vrFilter), &err_msg);
+
+       if( rc != LDAP_SUCCESS ) {
+               text = &err_msg;
+               if( rc == SLAPD_DISCONNECT ) {
+                       send_ldap_disconnect( conn, op,
+                               LDAP_PROTOCOL_ERROR, *text );
+               } else {
+                       send_ldap_result( conn, op, rc,
+                               NULL, *text, NULL, NULL );
+               }
+               if( fstr.bv_val != NULL) free( fstr.bv_val );
+               if( op->vrFilter != NULL) vrFilter_free( op->vrFilter ); 
+
+       } else {
+               vrFilter2bv( op->vrFilter, &fstr );
+       }
+
+#ifdef NEW_LOGGING
+       LDAP_LOG( OPERATION, ARGS, 
+               "parseValuesReturnFilter: conn %d       vrFilter: %s\n", 
+               conn->c_connid, fstr.bv_len ? fstr.bv_val : "empty" , 0 );
+#else
+       Debug( LDAP_DEBUG_ARGS, "       vrFilter: %s\n",
+               fstr.bv_len ? fstr.bv_val : "empty", 0, 0 );
+#endif
+
+       op->o_valuesreturnfilter = ctrl->ldctl_iscritical
+               ? SLAP_CRITICAL_CONTROL
+               : SLAP_NONCRITICAL_CONTROL;
+
+       return LDAP_SUCCESS;
+}
+#endif