ITS#6001 SID of queued CSN must match the one in the op

[openldap] / servers / slapd / back-sql / search.c

diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c
index e0777f3e8252d1a9198a88b040c75b67a6a2e896..a65ffcf027388734073696f83078dd9a92eb739f 100644 (file)
--- a/servers/slapd/back-sql/search.c
+++ b/servers/slapd/back-sql/search.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2007 The OpenLDAP Foundation.
+ * Copyright 1999-2009 The OpenLDAP Foundation.
  * Portions Copyright 1999 Dmitry Kovalev.
  * Portions Copyright 2002 Pierangelo Masarati.
  * Portions Copyright 2004 Mark Adamson.
@@ -184,7 +184,7 @@ backsql_init_search(
                        BER_BVZERO( &bsi->bsi_attrs[ 0 ].an_name );
        
                        for ( p = attrs; !BER_BVISNULL( &p->an_name ); p++ ) {
-                               if ( BACKSQL_NCMP( &p->an_name, &AllUser ) == 0 ) {
+                               if ( BACKSQL_NCMP( &p->an_name, slap_bv_all_user_attrs ) == 0 ) {
                                        /* handle "*" */
                                        bsi->bsi_flags |= BSQL_SF_ALL_USER;
 
@@ -198,7 +198,7 @@ backsql_init_search(
                                        }
                                        continue;
 
-                               } else if ( BACKSQL_NCMP( &p->an_name, &AllOper ) == 0 ) {
+                               } else if ( BACKSQL_NCMP( &p->an_name, slap_bv_all_operational_attrs ) == 0 ) {
                                        /* handle "+" */
                                        bsi->bsi_flags |= BSQL_SF_ALL_OPER;
 
@@ -212,7 +212,7 @@ backsql_init_search(
                                        }
                                        continue;
 
-                               } else if ( BACKSQL_NCMP( &p->an_name, &NoAttrs ) == 0 ) {
+                               } else if ( BACKSQL_NCMP( &p->an_name, slap_bv_no_attrs ) == 0 ) {
                                        /* ignore "1.1" */
                                        continue;
 
@@ -237,7 +237,7 @@ backsql_init_search(
                        
                        /* use hints if available */
                        for ( p = bi->sql_anlist; !BER_BVISNULL( &p->an_name ); p++ ) {
-                               if ( BACKSQL_NCMP( &p->an_name, &AllUser ) == 0 ) {
+                               if ( BACKSQL_NCMP( &p->an_name, slap_bv_all_user_attrs ) == 0 ) {
                                        /* handle "*" */
                                        bsi->bsi_flags |= BSQL_SF_ALL_USER;
 
@@ -251,7 +251,7 @@ backsql_init_search(
                                        }
                                        continue;
 
-                               } else if ( BACKSQL_NCMP( &p->an_name, &AllOper ) == 0 ) {
+                               } else if ( BACKSQL_NCMP( &p->an_name, slap_bv_all_operational_attrs ) == 0 ) {
                                        /* handle "+" */
                                        bsi->bsi_flags |= BSQL_SF_ALL_OPER;
 
@@ -864,7 +864,7 @@ backsql_process_filter( backsql_srch_info *bsi, Filter *f )
                struct berval   keyval;
 #else /* ! BACKSQL_ARBITRARY_KEY */
                unsigned long   keyval;
-               char            keyvalbuf[] = "18446744073709551615";
+               char            keyvalbuf[LDAP_PVT_INTTYPE_CHARS(unsigned long)];
 #endif /* ! BACKSQL_ARBITRARY_KEY */
 
                switch ( f->f_choice ) {
@@ -2668,12 +2668,7 @@ backsql_entry_release(
 static int
 parse_paged_cookie( Operation *op, SlapReply *rs )
 {
-       LDAPControl     **c;
        int             rc = LDAP_SUCCESS;
-       ber_tag_t       tag;
-       ber_int_t       size;
-       BerElement      *ber;
-       struct berval   cookie = BER_BVNULL;
        PagedResultsState *ps = op->o_pagedresults_state;
 
        /* this function must be invoked only if the pagedResults
@@ -2681,53 +2676,17 @@ parse_paged_cookie( Operation *op, SlapReply *rs )
         * by the frontend */
        assert( get_pagedresults( op ) > SLAP_CONTROL_IGNORED );
 
-       /* look for the appropriate ctrl structure */
-       for ( c = op->o_ctrls; c[0] != NULL; c++ ) {
-               if ( strcmp( c[0]->ldctl_oid, LDAP_CONTROL_PAGEDRESULTS ) == 0 )
-               {
-                       break;
-               }
-       }
-
-       if ( c[0] == NULL ) {
-               rs->sr_text = "missing pagedResults control";
-               return LDAP_PROTOCOL_ERROR;
-       }
-
-       /* Tested by frontend */
-       assert( c[0]->ldctl_value.bv_len > 0 );
-
-       /* Parse the control value
-        *      realSearchControlValue ::= SEQUENCE {
-        *              size    INTEGER (0..maxInt),
-        *                              -- requested page size from client
-        *                              -- result set size estimate from server
-        *              cookie  OCTET STRING
-        * }
-        */
-       ber = ber_init( &c[0]->ldctl_value );
-       if ( ber == NULL ) {
-               rs->sr_text = "internal error";
-               return LDAP_OTHER;
-       }
-
-       tag = ber_scanf( ber, "{im}", &size, &cookie );
-
-       /* Tested by frontend */
-       assert( tag != LBER_ERROR );
-       assert( size >= 0 );
-
        /* cookie decoding/checks deferred to backend... */
-       if ( cookie.bv_len ) {
+       if ( ps->ps_cookieval.bv_len ) {
                PagedResultsCookie reqcookie;
-               if( cookie.bv_len != sizeof( reqcookie ) ) {
+               if( ps->ps_cookieval.bv_len != sizeof( reqcookie ) ) {
                        /* bad cookie */
                        rs->sr_text = "paged results cookie is invalid";
                        rc = LDAP_PROTOCOL_ERROR;
                        goto done;
                }
 
-               AC_MEMCPY( &reqcookie, cookie.bv_val, sizeof( reqcookie ));
+               AC_MEMCPY( &reqcookie, ps->ps_cookieval.bv_val, sizeof( reqcookie ));
 
                if ( reqcookie > ps->ps_cookie ) {
                        /* bad cookie */
@@ -2743,22 +2702,11 @@ parse_paged_cookie( Operation *op, SlapReply *rs )
 
        } else {
                /* Initial request.  Initialize state. */
-#if 0
-               if ( op->o_conn->c_pagedresults_state.ps_cookie != 0 ) {
-                       /* There's another pagedResults control on the
-                        * same connection; reject new pagedResults controls 
-                        * (allowed by RFC2696) */
-                       rs->sr_text = "paged results cookie unavailable; try later";
-                       rc = LDAP_UNWILLING_TO_PERFORM;
-                       goto done;
-               }
-#endif
                ps->ps_cookie = 0;
                ps->ps_count = 0;
        }
 
 done:;
-       (void)ber_free( ber, 1 );
 
        return rc;
 }