initialize AttributeAssertion before using

[openldap] / servers / slapd / limits.c

diff --git a/servers/slapd/limits.c b/servers/slapd/limits.c
index 3f507f27f2c7e41c76823eb4450a841c05c44f84..49892a049ab8d727d286cc0c24a2c6c614ced13f 100644 (file)
--- a/servers/slapd/limits.c
+++ b/servers/slapd/limits.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -74,9 +74,9 @@ limits_get(
        assert( op );
        assert( limit );
 
-       Debug( LDAP_DEBUG_TRACE, "==> limits_get: conn=%lu op=%lu dn=\"%s\"\n",
-                       op->o_connid, op->o_opid,
-                       BER_BVISNULL( ndn ) ? "[anonymous]" : ndn->bv_val );
+       Debug( LDAP_DEBUG_TRACE, "==> limits_get: %s dn=\"%s\"\n",
+                       op->o_log_prefix,
+                       BER_BVISNULL( ndn ) ? "[anonymous]" : ndn->bv_val, 0 );
        /*
         * default values
         */
@@ -494,8 +494,12 @@ limits_parse(
                        struct berval   oc, ad;
 
                        oc.bv_val = pattern + 1;
+                       pattern = strchr( pattern, '=' );
+                       if ( pattern == NULL ) {
+                               return -1;
+                       }
 
-                       ad.bv_val = strchr(pattern, '/');
+                       ad.bv_val = strchr( oc.bv_val, '/' );
                        if ( ad.bv_val != NULL ) {
                                const char      *text = NULL;
                                int             rc;
@@ -503,18 +507,14 @@ limits_parse(
                                oc.bv_len = ad.bv_val - oc.bv_val;
 
                                ad.bv_val++;
-                               ad.bv_len = strlen( ad.bv_val );
+                               ad.bv_len = pattern - ad.bv_val;
                                rc = slap_bv2ad( &ad, &group_ad, &text );
                                if ( rc != LDAP_SUCCESS ) {
                                        goto no_ad;
                                }
 
-                               pattern = ad.bv_val + ad.bv_len;
-
                        } else {
-                               oc.bv_len = strlen( oc.bv_val );
-
-                               pattern = oc.bv_val + oc.bv_len;
+                               oc.bv_len = pattern - oc.bv_val;
                        }
 
                        group_oc = oc_bvfind( &oc );
@@ -982,9 +982,10 @@ limits_check( Operation *op, SlapReply *rs )
                }
 
                /* if paged results is requested */     
-               if ( get_pagedresults( op ) > SLAP_NO_CONTROL ) {
+               if ( get_pagedresults( op ) > SLAP_CONTROL_IGNORED ) {
                        int     slimit = -2;
                        int     pr_total;
+                       PagedResultsState *ps = op->o_pagedresults_state;
 
                        /* paged results is not allowed */
                        if ( op->ors_limit->lms_s_pr_total == -2 ) {
@@ -996,7 +997,7 @@ limits_check( Operation *op, SlapReply *rs )
                                return -1;
                        }
                        
-                       if ( op->ors_limit->lms_s_pr > 0 && op->o_pagedresults_size > op->ors_limit->lms_s_pr ) {
+                       if ( op->ors_limit->lms_s_pr > 0 && ps->ps_size > op->ors_limit->lms_s_pr ) {
                                rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
                                rs->sr_text = "illegal pagedResults page size";
                                send_ldap_result( op, rs );
@@ -1020,7 +1021,7 @@ limits_check( Operation *op, SlapReply *rs )
                                        slimit = -1;
 
                                } else {
-                                       slimit = op->ors_slimit - op->o_pagedresults_state.ps_count;
+                                       slimit = op->ors_slimit - ps->ps_count;
                                }
 
 #ifdef ABOVE_HARD_LIMIT_IS_ERROR
@@ -1056,7 +1057,7 @@ limits_check( Operation *op, SlapReply *rs )
                                        slimit2 = op->ors_slimit;
                                }
 
-                               total = slimit2 - op->o_pagedresults_state.ps_count;
+                               total = slimit2 - ps->ps_count;
 
                                if ( total >= 0 ) {
                                        if ( op->ors_limit->lms_s_pr > 0 ) {
@@ -1092,7 +1093,7 @@ limits_check( Operation *op, SlapReply *rs )
                                        op->ors_slimit = slimit;
 
                                } else if ( slimit > 0 ) {
-                                       if ( op->ors_slimit - op->o_pagedresults_state.ps_count > slimit ) {
+                                       if ( op->ors_slimit - ps->ps_count > slimit ) {
                                                rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
                                                send_ldap_result( op, rs );
                                                rs->sr_err = LDAP_SUCCESS;