]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/limits.c
ITS#2919 move OpenLDAPtime to OpenLDAPperson
[openldap] / servers / slapd / limits.c
index 6b0953a3a1dadcc927b7dad5429b89f70b980425..3e0dbdc81571b8a1076b12c7a5f69c7514340b70 100644 (file)
@@ -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
 #include <ac/string.h>
 
 #include "slap.h"
+#include "lutil.h"
+
+/* define to get an error if requesting limit higher than hard */
+#undef ABOVE_HARD_LIMIT_IS_ERROR
+
+static char *
+limits2str( unsigned i )
+{
+       switch ( i ) {
+       case SLAP_LIMITS_UNDEFINED:
+               return "UNDEFINED";
+
+       case SLAP_LIMITS_EXACT:
+               return "EXACT";
+                       
+       case SLAP_LIMITS_ONE:
+               return "ONELEVEL";      
+
+       case SLAP_LIMITS_SUBTREE:
+               return "SUBTREE";
+
+       case SLAP_LIMITS_CHILDREN:
+               return "CHILDREN";
+
+       case SLAP_LIMITS_REGEX:
+               return "REGEX";
+
+       case SLAP_LIMITS_ANONYMOUS:
+               return "ANONYMOUS";
+               
+       case SLAP_LIMITS_USERS:
+               return "USERS";
+               
+       case SLAP_LIMITS_ANY:
+               return "ANY";
+
+       default:
+               return "UNKNOWN";
+       }
+}
 
 int
-get_limits
+limits_get
        Operation               *op,
        struct berval           *ndn, 
        struct slap_limits_set  **limit
@@ -35,6 +75,9 @@ get_limits(
        assert( op );
        assert( limit );
 
+       Debug( LDAP_DEBUG_TRACE, "==> limits_get: %s dn=\"%s\"\n",
+                       op->o_log_prefix,
+                       BER_BVISNULL( ndn ) ? "[anonymous]" : ndn->bv_val, 0 );
        /*
         * default values
         */
@@ -63,13 +106,22 @@ get_limits(
                                                lm[0]->lm_group_ad );
                                if ( rc == 0 ) {
                                        *limit = &lm[0]->lm_limits;
+                                       Debug( LDAP_DEBUG_TRACE, "<== limits_get: type=GROUP match=EXACT "
+                                                       "dn=\"%s\" oc=\"%s\" ad=\"%s\"\n",
+                                                       lm[0]->lm_pat.bv_val,
+                                                       lm[0]->lm_group_oc->soc_cname.bv_val,
+                                                       lm[0]->lm_group_ad->ad_cname.bv_val );
+
                                        return( 0 );
                                }
-                       }
+                       } else {
                        
-                       if ( dn_match( &lm[0]->lm_pat, ndn ) ) {
-                               *limit = &lm[0]->lm_limits;
-                               return( 0 );
+                               if ( dn_match( &lm[0]->lm_pat, ndn ) ) {
+                                       *limit = &lm[0]->lm_limits;
+                                       Debug( LDAP_DEBUG_TRACE, "<== limits_get: type=DN match=EXACT dn=\"%s\"\n",
+                                                       lm[0]->lm_pat.bv_val, 0, 0 );
+                                       return( 0 );
+                               }
                        }
                        break;
 
@@ -119,6 +171,8 @@ get_limits(
                                }
 
                                *limit = &lm[0]->lm_limits;
+                               Debug( LDAP_DEBUG_TRACE, "<== limits_get: type=DN match=%s dn=\"%s\"\n",
+                                               limits2str( style ), lm[0]->lm_pat.bv_val, 0 );
                                return( 0 );
                        }
 
@@ -133,12 +187,16 @@ get_limits(
                                                0, NULL, 0 ) == 0 )
                        {
                                *limit = &lm[0]->lm_limits;
+                               Debug( LDAP_DEBUG_TRACE, "<== limits_get: type=DN match=%s dn=\"%s\"\n",
+                                               limits2str( style ), lm[0]->lm_pat.bv_val, 0 );
                                return( 0 );
                        }
                        break;
 
                case SLAP_LIMITS_ANONYMOUS:
                        if ( ndn->bv_len == 0 ) {
+                               Debug( LDAP_DEBUG_TRACE, "<== limits_get: type=DN match=%s\n",
+                                               limits2str( style ), 0, 0 );
                                *limit = &lm[0]->lm_limits;
                                return( 0 );
                        }
@@ -147,6 +205,8 @@ get_limits(
                case SLAP_LIMITS_USERS:
                        if ( ndn->bv_len != 0 ) {
                                *limit = &lm[0]->lm_limits;
+                               Debug( LDAP_DEBUG_TRACE, "<== limits_get: type=DN match=%s\n",
+                                               limits2str( style ), 0, 0 );
                                return( 0 );
                        }
                        break;
@@ -165,7 +225,7 @@ get_limits(
 }
 
 static int
-add_limits(
+limits_add(
        Backend                 *be,
        unsigned                flags,
        const char              *pattern,
@@ -267,7 +327,7 @@ add_limits(
 }
 
 int
-parse_limits(
+limits_parse(
        Backend     *be,
        const char  *fname,
        int         lineno,
@@ -285,16 +345,10 @@ parse_limits(
        assert( be );
 
        if ( argc < 3 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( CONFIG, CRIT, 
-                       "%s : line %d: missing arg(s) in "
-                       "\"limits <pattern> <limits>\" line.\n", fname, lineno, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "%s : line %d: missing arg(s) in "
                        "\"limits <pattern> <limits>\" line.\n%s",
                        fname, lineno, "" );
-#endif
                return( -1 );
        }
 
@@ -341,71 +395,57 @@ parse_limits(
        } else if ( strcasecmp( pattern, "users" ) == 0 ) {
                flags = SLAP_LIMITS_USERS;
                
-       } else if ( strncasecmp( pattern, "dn", sizeof( "dn" ) - 1 ) == 0 ) {
-               pattern += sizeof( "dn" ) - 1;
+       } else if ( strncasecmp( pattern, "dn", STRLENOF( "dn" ) ) == 0 ) {
+               pattern += STRLENOF( "dn" );
                if ( pattern[0] == '.' ) {
                        pattern++;
-                       if ( strncasecmp( pattern, "exact", sizeof( "exact" ) - 1 ) == 0 ) {
+                       if ( strncasecmp( pattern, "exact", STRLENOF( "exact" )) == 0 ) {
                                flags = SLAP_LIMITS_EXACT;
-                               pattern += sizeof( "exact" ) - 1;
+                               pattern += STRLENOF( "exact" );
 
-                       } else if ( strncasecmp( pattern, "base", sizeof( "base" ) - 1 ) == 0 ) {
+                       } else if ( strncasecmp( pattern, "base", STRLENOF( "base" ) ) == 0 ) {
                                flags = SLAP_LIMITS_BASE;
-                               pattern += sizeof( "base" ) - 1;
+                               pattern += STRLENOF( "base" );
 
-                       } else if ( strncasecmp( pattern, "one", sizeof( "one" ) - 1 ) == 0 ) {
+                       } else if ( strncasecmp( pattern, "one", STRLENOF( "one" ) ) == 0 ) {
                                flags = SLAP_LIMITS_ONE;
-                               pattern += sizeof( "one" ) - 1;
-                               if ( strncasecmp( pattern, "level", sizeof( "level" ) - 1 ) == 0 ) {
-                                       pattern += sizeof( "level" ) - 1;
+                               pattern += STRLENOF( "one" );
+                               if ( strncasecmp( pattern, "level", STRLENOF( "level" ) ) == 0 ) {
+                                       pattern += STRLENOF( "level" );
 
                                } else {
-#ifdef NEW_LOGGING
-                                       LDAP_LOG( CONFIG, WARNING , 
-                                               "%s : line %d: deprecated \"one\" style "
-                                               "\"limits <pattern> <limits>\" line; "
-                                               "use \"onelevel\" instead.\n", fname, lineno, 0 );
-#else
                                        Debug( LDAP_DEBUG_ANY,
                                                "%s : line %d: deprecated \"one\" style "
                                                "\"limits <pattern> <limits>\" line; "
                                                "use \"onelevel\" instead.\n", fname, lineno, 0 );
-#endif
                                }
 
-                       } else if ( strncasecmp( pattern, "sub", sizeof( "sub" ) - 1 ) == 0 ) {
+                       } else if ( strncasecmp( pattern, "sub", STRLENOF( "sub" ) ) == 0 ) {
                                flags = SLAP_LIMITS_SUBTREE;
-                               pattern += sizeof( "sub" ) - 1;
-                               if ( strncasecmp( pattern, "tree", sizeof( "tree" ) - 1 ) == 0 ) {
-                                       pattern += sizeof( "tree" ) - 1;
+                               pattern += STRLENOF( "sub" );
+                               if ( strncasecmp( pattern, "tree", STRLENOF( "tree" ) ) == 0 ) {
+                                       pattern += STRLENOF( "tree" );
 
                                } else {
-#ifdef NEW_LOGGING
-                                       LDAP_LOG( CONFIG, WARNING , 
-                                               "%s : line %d: deprecated \"sub\" style "
-                                               "\"limits <pattern> <limits>\" line; "
-                                               "use \"subtree\" instead.\n", fname, lineno, 0 );
-#else
                                        Debug( LDAP_DEBUG_ANY,
                                                "%s : line %d: deprecated \"sub\" style "
                                                "\"limits <pattern> <limits>\" line; "
                                                "use \"subtree\" instead.\n", fname, lineno, 0 );
-#endif
                                }
 
-                       } else if ( strncasecmp( pattern, "children", sizeof( "children" ) - 1 ) == 0 ) {
+                       } else if ( strncasecmp( pattern, "children", STRLENOF( "children" ) ) == 0 ) {
                                flags = SLAP_LIMITS_CHILDREN;
-                               pattern += sizeof( "children" ) - 1;
+                               pattern += STRLENOF( "children" );
 
-                       } else if ( strncasecmp( pattern, "regex", sizeof( "regex" ) - 1 ) == 0 ) {
+                       } else if ( strncasecmp( pattern, "regex", STRLENOF( "regex" ) ) == 0 ) {
                                flags = SLAP_LIMITS_REGEX;
-                               pattern += sizeof( "regex" ) - 1;
+                               pattern += STRLENOF( "regex" );
 
                        /* 
                         * this could be deprecated in favour
                         * of the pattern = "anonymous" form
                         */
-                       } else if ( strncasecmp( pattern, "anonymous", sizeof( "anonymous" ) - 1 ) == 0 ) {
+                       } else if ( strncasecmp( pattern, "anonymous", STRLENOF( "anonymous" ) ) == 0 ) {
                                flags = SLAP_LIMITS_ANONYMOUS;
                                pattern = NULL;
                        }
@@ -422,13 +462,6 @@ parse_limits(
 
                default:
                        if ( pattern[0] != '=' ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG( CONFIG, CRIT, 
-                                       "%s : line %d: missing '=' in "
-                                       "\"dn[.{exact|base|onelevel|subtree"
-                                       "|children|regex|anonymous}]" "=<pattern>\" in "
-                                       "\"limits <pattern> <limits>\" line.\n", fname, lineno, 0 );
-#else
                                Debug( LDAP_DEBUG_ANY,
                                        "%s : line %d: missing '=' in "
                                        "\"dn[.{exact|base|onelevel|subtree"
@@ -437,7 +470,6 @@ parse_limits(
                                        "\"limits <pattern> <limits>\" "
                                        "line.\n%s",
                                        fname, lineno, "" );
-#endif
                                return( -1 );
                        }
 
@@ -456,15 +488,19 @@ parse_limits(
                        }
                }
 
-       } else if (strncasecmp( pattern, "group", sizeof( "group" ) - 1 ) == 0 ) {
-               pattern += sizeof( "group" ) - 1;
+       } else if (strncasecmp( pattern, "group", STRLENOF( "group" ) ) == 0 ) {
+               pattern += STRLENOF( "group" );
 
                if ( pattern[0] == '/' ) {
                        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;
@@ -472,18 +508,14 @@ parse_limits(
                                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 );
@@ -515,21 +547,12 @@ no_ad:;
                flags = SLAP_LIMITS_TYPE_GROUP | SLAP_LIMITS_EXACT;
 
                if ( pattern[0] != '=' ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( CONFIG, CRIT, 
-                               "%s : line %d: missing '=' in "
-                               "\"group[/objectClass[/attributeType]]"
-                               "=<pattern>\" in "
-                               "\"limits <pattern> <limits>\" line.\n",
-                               fname, lineno, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "%s : line %d: missing '=' in "
                                "\"group[/objectClass[/attributeType]]"
                                "=<pattern>\" in "
                                "\"limits <pattern> <limits>\" line.\n",
                                fname, lineno, 0 );
-#endif
                        return( -1 );
                }
 
@@ -539,19 +562,12 @@ no_ad:;
 
        /* get the limits */
        for ( i = 2; i < argc; i++ ) {
-               if ( parse_limit( argv[i], &limit ) ) {
+               if ( limits_parse_one( argv[i], &limit ) ) {
 
-#ifdef NEW_LOGGING
-                       LDAP_LOG( CONFIG, CRIT, 
-                               "%s : line %d: unknown limit values \"%s\" in "
-                               "\"limits <pattern> <limits>\" line.\n",
-                               fname, lineno, argv[i] );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "%s : line %d: unknown limit values \"%s\" in "
                                "\"limits <pattern> <limits>\" line.\n",
                        fname, lineno, argv[i] );
-#endif
 
                        return( 1 );
                }
@@ -559,6 +575,8 @@ no_ad:;
 
        /*
         * sanity checks ...
+        *
+        * FIXME: add warnings?
         */
        if ( limit.lms_t_hard > 0 && 
                        ( limit.lms_t_hard < limit.lms_t_soft 
@@ -571,28 +589,50 @@ no_ad:;
                          || limit.lms_s_soft == -1 ) ) {
                limit.lms_s_hard = limit.lms_s_soft;
        }
-       
-       rc = add_limits( be, flags, pattern, group_oc, group_ad, &limit );
+
+       /*
+        * defaults ...
+        * 
+        * lms_t_hard:
+        *      -1      => no limits
+        *      0       => same as soft
+        *      > 0     => limit (in seconds)
+        *
+        * lms_s_hard:
+        *      -1      => no limits
+        *      0       0> same as soft
+        *      > 0     => limit (in entries)
+        *
+        * lms_s_pr_total:
+        *      -2      => disable the control
+        *      -1      => no limits
+        *      0       => same as soft
+        *      > 0     => limit (in entries)
+        *
+        * lms_s_pr:
+        *      -1      => no limits
+        *      0       => no limits?
+        *      > 0     => limit size (in entries)
+        */
+       if ( limit.lms_s_pr_total > 0 &&
+                       limit.lms_s_pr > limit.lms_s_pr_total ) {
+               limit.lms_s_pr = limit.lms_s_pr_total;
+       }
+
+       rc = limits_add( be, flags, pattern, group_oc, group_ad, &limit );
        if ( rc ) {
 
-#ifdef NEW_LOGGING
-               LDAP_LOG( CONFIG, CRIT, 
-                       "%s : line %d: unable to add limit in "
-                       "\"limits <pattern> <limits>\" line.\n",
-                       fname, lineno, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "%s : line %d: unable to add limit in "
                        "\"limits <pattern> <limits>\" line.\n",
                fname, lineno, 0 );
-#endif
        }
 
        return( rc );
 }
 
 int
-parse_limit(
+limits_parse_one(
        const char              *arg,
        struct slap_limits_set  *limit
 )
@@ -600,47 +640,64 @@ parse_limit(
        assert( arg );
        assert( limit );
 
-       if ( strncasecmp( arg, "time", sizeof( "time" ) - 1 ) == 0 ) {
-               arg += 4;
+       if ( strncasecmp( arg, "time", STRLENOF( "time" ) ) == 0 ) {
+               arg += STRLENOF( "time" );
 
                if ( arg[0] == '.' ) {
                        arg++;
-                       if ( strncasecmp( arg, "soft", sizeof( "soft" ) - 1 ) == 0 ) {
-                               arg += 4;
-                               if ( arg[0] != '=' ) {
-                                       return( 1 );
-                               }
-                               arg++;
-                               if ( strcasecmp( arg, "none" ) == 0 ) {
+                       if ( strncasecmp( arg, "soft=", STRLENOF( "soft=" ) ) == 0 ) {
+                               arg += STRLENOF( "soft=" );
+                               if ( strcasecmp( arg, "unlimited" ) == 0 || strcasecmp( arg, "none" ) == 0 ) {
                                        limit->lms_t_soft = -1;
+
                                } else {
                                        char    *next = NULL;
+                                       int     soft = strtol( arg, &next, 10 );
 
-                                       limit->lms_t_soft = 
-                                               strtol( arg, &next, 10 );
-                                       if ( next == arg || limit->lms_t_soft < -1 ) {
+                                       if ( next == arg || next[ 0 ] != '\0' ) {
                                                return( 1 );
                                        }
+
+                                       if ( soft < -1 ) {
+                                               return( 1 );
+                                       }
+
+                                       if ( soft == -1 ) {
+                                               /* FIXME: use "unlimited" instead; issue warning? */
+                                       }
+
+                                       limit->lms_t_soft = soft;
                                }
                                
-                       } else if ( strncasecmp( arg, "hard", sizeof( "hard" ) - 1 ) == 0 ) {
-                               arg += 4;
-                               if ( arg[0] != '=' ) {
-                                       return( 1 );
-                               }
-                               arg++;
+                       } else if ( strncasecmp( arg, "hard=", STRLENOF( "hard=" ) ) == 0 ) {
+                               arg += STRLENOF( "hard=" );
                                if ( strcasecmp( arg, "soft" ) == 0 ) {
                                        limit->lms_t_hard = 0;
-                               } else if ( strcasecmp( arg, "none" ) == 0 ) {
+
+                               } else if ( strcasecmp( arg, "unlimited" ) == 0 || strcasecmp( arg, "none" ) == 0 ) {
                                        limit->lms_t_hard = -1;
+
                                } else {
                                        char    *next = NULL;
+                                       int     hard = strtol( arg, &next, 10 );
+
+                                       if ( next == arg || next[ 0 ] != '\0' ) {
+                                               return( 1 );
+                                       }
 
-                                       limit->lms_t_hard = 
-                                               strtol( arg, &next, 10 );
-                                       if ( next == arg || limit->lms_t_hard < -1 ) {
+                                       if ( hard < -1 ) {
                                                return( 1 );
                                        }
+
+                                       if ( hard == -1 ) {
+                                               /* FIXME: use "unlimited" instead */
+                                       }
+
+                                       if ( hard == 0 ) {
+                                               /* FIXME: use "soft" instead */
+                                       }
+
+                                       limit->lms_t_hard = hard;
                                }
                                
                        } else {
@@ -649,8 +706,9 @@ parse_limit(
                        
                } else if ( arg[0] == '=' ) {
                        arg++;
-                       if ( strcasecmp( arg, "none" ) == 0 ) {
+                       if ( strcasecmp( arg, "unlimited" ) == 0 || strcasecmp( arg, "none" ) == 0 ) {
                                limit->lms_t_soft = -1;
+
                        } else {
                                char    *next = NULL;
 
@@ -665,93 +723,165 @@ parse_limit(
                        return( 1 );
                }
 
-       } else if ( strncasecmp( arg, "size", sizeof( "size" ) - 1 ) == 0 ) {
-               arg += 4;
+       } else if ( strncasecmp( arg, "size", STRLENOF( "size" ) ) == 0 ) {
+               arg += STRLENOF( "size" );
                
                if ( arg[0] == '.' ) {
                        arg++;
-                       if ( strncasecmp( arg, "soft", sizeof( "soft" ) - 1 ) == 0 ) {
-                               arg += 4;
-                               if ( arg[0] != '=' ) {
-                                       return( 1 );
-                               }
-                               arg++;
-                               if ( strcasecmp( arg, "none" ) == 0 ) {
+                       if ( strncasecmp( arg, "soft=", STRLENOF( "soft=" ) ) == 0 ) {
+                               arg += STRLENOF( "soft=" );
+                               if ( strcasecmp( arg, "unlimited" ) == 0 || strcasecmp( arg, "none" ) == 0 ) {
                                        limit->lms_s_soft = -1;
+
                                } else {
                                        char    *next = NULL;
+                                       int     soft = strtol( arg, &next, 10 );
+
+                                       if ( next == arg || next[ 0 ] != '\0' ) {
+                                               return( 1 );
+                                       }
 
-                                       limit->lms_s_soft = 
-                                               strtol( arg, &next, 10 );
-                                       if ( next == arg || limit->lms_s_soft < -1 ) {
+                                       if ( soft < -1 ) {
                                                return( 1 );
                                        }
+
+                                       if ( soft == -1 ) {
+                                               /* FIXME: use "unlimited" instead */
+                                       }
+
+                                       limit->lms_s_soft = soft;
                                }
                                
-                       } else if ( strncasecmp( arg, "hard", sizeof( "hard" ) - 1 ) == 0 ) {
-                               arg += 4;
-                               if ( arg[0] != '=' ) {
-                                       return( 1 );
-                               }
-                               arg++;
+                       } else if ( strncasecmp( arg, "hard=", STRLENOF( "hard=" ) ) == 0 ) {
+                               arg += STRLENOF( "hard=" );
                                if ( strcasecmp( arg, "soft" ) == 0 ) {
                                        limit->lms_s_hard = 0;
-                               } else if ( strcasecmp( arg, "none" ) == 0 ) {
+
+                               } else if ( strcasecmp( arg, "unlimited" ) == 0 || strcasecmp( arg, "none" ) == 0 ) {
                                        limit->lms_s_hard = -1;
+
                                } else {
                                        char    *next = NULL;
+                                       int     hard = strtol( arg, &next, 10 );
 
-                                       limit->lms_s_hard = 
-                                               strtol( arg, &next, 10 );
-                                       if ( next == arg || limit->lms_s_hard < -1 ) {
+                                       if ( next == arg || next[ 0 ] != '\0' ) {
                                                return( 1 );
                                        }
+
+                                       if ( hard < -1 ) {
+                                               return( 1 );
+                                       }
+
+                                       if ( hard == -1 ) {
+                                               /* FIXME: use "unlimited" instead */
+                                       }
+
+                                       if ( hard == 0 ) {
+                                               /* FIXME: use "soft" instead */
+                                       }
+
+                                       limit->lms_s_hard = hard;
                                }
                                
-                       } else if ( strncasecmp( arg, "unchecked", sizeof( "unchecked" ) - 1 ) == 0 ) {
-                               arg += 9;
-                               if ( arg[0] != '=' ) {
-                                       return( 1 );
-                               }
-                               arg++;
-                               if ( strcasecmp( arg, "none" ) == 0 ) {
+                       } else if ( strncasecmp( arg, "unchecked=", STRLENOF( "unchecked=" ) ) == 0 ) {
+                               arg += STRLENOF( "unchecked=" );
+                               if ( strcasecmp( arg, "unlimited" ) == 0 || strcasecmp( arg, "none" ) == 0 ) {
                                        limit->lms_s_unchecked = -1;
+
+                               } else if ( strcasecmp( arg, "disabled" ) == 0 ) {
+                                       limit->lms_s_unchecked = 0;
+
                                } else {
                                        char    *next = NULL;
+                                       int     unchecked = strtol( arg, &next, 10 );
 
-                                       limit->lms_s_unchecked = 
-                                               strtol( arg, &next, 10 );
-                                       if ( next == arg || limit->lms_s_unchecked < -1 ) {
+                                       if ( next == arg || next[ 0 ] != '\0' ) {
                                                return( 1 );
                                        }
-                               }
 
-                       } else if ( strncasecmp( arg, "pr", sizeof( "pr" ) - 1 ) == 0 ) {
-                               arg += sizeof( "pr" ) - 1;
-                               if ( arg[0] != '=' ) {
-                                       return( 1 );
+                                       if ( unchecked < -1 ) {
+                                               return( 1 );
+                                       }
+
+                                       if ( unchecked == -1 ) {
+                                               /*  FIXME: use "unlimited" instead */
+                                       }
+
+                                       limit->lms_s_unchecked = unchecked;
                                }
-                               arg++;
+
+                       } else if ( strncasecmp( arg, "pr=", STRLENOF( "pr=" ) ) == 0 ) {
+                               arg += STRLENOF( "pr=" );
                                if ( strcasecmp( arg, "noEstimate" ) == 0 ) {
                                        limit->lms_s_pr_hide = 1;
+
+                               } else if ( strcasecmp( arg, "unlimited" ) == 0 || strcasecmp( arg, "none" ) == 0 ) {
+                                       limit->lms_s_pr = -1;
+
                                } else {
                                        char    *next = NULL;
+                                       int     pr = strtol( arg, &next, 10 );
+
+                                       if ( next == arg || next[ 0 ] != '\0' ) {
+                                               return( 1 );
+                                       }
 
-                                       limit->lms_s_pr = 
-                                               strtol( arg, &next, 10 );
-                                       if ( next == arg || limit->lms_s_pr < -1 ) {
+                                       if ( pr < -1 ) {
                                                return( 1 );
                                        }
+
+                                       if ( pr == -1 ) {
+                                               /* FIXME: use "unlimited" instead */
+                                       }
+
+                                       limit->lms_s_pr = pr;
                                }
-                               
+
+                       } else if ( strncasecmp( arg, "prtotal=", STRLENOF( "prtotal=" ) ) == 0 ) {
+                               arg += STRLENOF( "prtotal=" );
+
+                               if ( strcasecmp( arg, "unlimited" ) == 0 || strcasecmp( arg, "none" ) == 0 ) {
+                                       limit->lms_s_pr_total = -1;
+
+                               } else if ( strcasecmp( arg, "disabled" ) == 0 ) {
+                                       limit->lms_s_pr_total = -2;
+
+                               } else if ( strcasecmp( arg, "hard" ) == 0 ) {
+                                       limit->lms_s_pr_total = 0;
+
+                               } else {
+                                       char    *next = NULL;
+                                       int     total;
+
+                                       total = strtol( arg, &next, 10 );
+                                       if ( next == arg || next[ 0 ] != '\0' ) {
+                                               return( 1 );
+                                       }
+
+                                       if ( total < -1 ) {
+                                               return( 1 );
+                                       }
+
+                                       if ( total == -1 ) {
+                                               /* FIXME: use "unlimited" instead */
+                                       }
+
+                                       if ( total == 0 ) {
+                                               /* FIXME: use "pr=disable" instead */
+                                       }
+
+                                       limit->lms_s_pr_total = total;
+                               }
+
                        } else {
                                return( 1 );
                        }
                        
                } else if ( arg[0] == '=' ) {
                        arg++;
-                       if ( strcasecmp( arg, "none" ) == 0 ) {
+                       if ( strcasecmp( arg, "unlimited" ) == 0 || strcasecmp( arg, "none" ) == 0 ) {
                                limit->lms_s_soft = -1;
+
                        } else {
                                char    *next = NULL;
 
@@ -770,3 +900,422 @@ parse_limit(
        return 0;
 }
 
+static const char *lmpats[] = {
+       "exact",
+       "exact",
+       "onelvel",
+       "subtree",
+       "children",
+       "regex",
+       "anonymous",
+       "users",
+       "*"
+};
+
+/* Caller must provide an adequately sized buffer in bv */
+void
+limits_unparse( struct slap_limits *lim, struct berval *bv )
+{
+       struct berval btmp;
+       char *ptr;
+       int lm;
+
+       if ( !bv || !bv->bv_val ) return;
+
+       ptr = bv->bv_val;
+
+       if (( lim->lm_flags & SLAP_LIMITS_TYPE_MASK ) == SLAP_LIMITS_TYPE_GROUP ) {
+               ptr = lutil_strcopy( ptr, "group/" );
+               ptr = lutil_strcopy( ptr, lim->lm_group_oc->soc_cname.bv_val );
+               *ptr++ = '/';
+               ptr = lutil_strcopy( ptr, lim->lm_group_ad->ad_cname.bv_val );
+               ptr = lutil_strcopy( ptr, "=\"" );
+               ptr = lutil_strcopy( ptr, lim->lm_pat.bv_val );
+               *ptr++ = '"';
+       } else {
+               lm = lim->lm_flags & SLAP_LIMITS_MASK;
+               switch( lm ) {
+               case SLAP_LIMITS_ANONYMOUS:
+               case SLAP_LIMITS_USERS:
+               case SLAP_LIMITS_ANY:
+                       ptr = lutil_strcopy( ptr, lmpats[lm] );
+                       break;
+               case SLAP_LIMITS_UNDEFINED:
+               case SLAP_LIMITS_EXACT:
+               case SLAP_LIMITS_ONE:
+               case SLAP_LIMITS_SUBTREE:
+               case SLAP_LIMITS_CHILDREN:
+               case SLAP_LIMITS_REGEX:
+                       ptr = lutil_strcopy( ptr, "dn." );
+                       ptr = lutil_strcopy( ptr, lmpats[lm] );
+                       *ptr++ = '=';
+                       *ptr++ = '"';
+                       ptr = lutil_strcopy( ptr, lim->lm_pat.bv_val );
+                       *ptr++ = '"';
+                       break;
+               }
+       }
+       *ptr++ = ' ';
+       bv->bv_len = ptr - bv->bv_val;
+       btmp.bv_val = ptr;
+       btmp.bv_len = 0;
+       limits_unparse_one( &lim->lm_limits, SLAP_LIMIT_SIZE|SLAP_LIMIT_TIME, &btmp );
+       bv->bv_len += btmp.bv_len;
+}
+
+/* Caller must provide an adequately sized buffer in bv */
+void
+limits_unparse_one( struct slap_limits_set *lim, int which, struct berval *bv )
+{
+       char *ptr;
+
+       if ( !bv || !bv->bv_val ) return;
+
+       ptr = bv->bv_val;
+
+       if ( which & SLAP_LIMIT_SIZE ) {
+               if ( lim->lms_s_soft != SLAPD_DEFAULT_SIZELIMIT ) {
+
+                       /* If same as global limit, drop it */
+                       if ( lim != &frontendDB->be_def_limit &&
+                               lim->lms_s_soft == frontendDB->be_def_limit.lms_s_soft )
+                               goto s_hard;
+                       /* If there's also a hard limit, fully qualify this one */
+                       else if ( lim->lms_s_hard )
+                               ptr = lutil_strcopy( ptr, " size.soft=" );
+
+                       /* If doing both size & time, qualify this */
+                       else if ( which & SLAP_LIMIT_TIME )
+                               ptr = lutil_strcopy( ptr, " size=" );
+
+                       if ( lim->lms_s_soft == -1 )
+                               ptr = lutil_strcopy( ptr, "unlimited" );
+                       else
+                               ptr += sprintf( ptr, "%d", lim->lms_s_soft );
+                       *ptr++ = ' ';
+               }
+s_hard:
+               if ( lim->lms_s_hard ) {
+                       ptr = lutil_strcopy( ptr, " size.hard=" );
+                       if ( lim->lms_s_hard == -1 )
+                               ptr = lutil_strcopy( ptr, "unlimited" );
+                       else
+                               ptr += sprintf( ptr, "%d", lim->lms_s_hard );
+                       *ptr++ = ' ';
+               }
+               if ( lim->lms_s_unchecked != -1 ) {
+                       ptr = lutil_strcopy( ptr, " size.unchecked=" );
+                       if ( lim->lms_s_unchecked == 0 )
+                               ptr = lutil_strcopy( ptr, "disabled" );
+                       else
+                               ptr += sprintf( ptr, "%d", lim->lms_s_unchecked );
+                       *ptr++ = ' ';
+               }
+               if ( lim->lms_s_pr_hide ) {
+                       ptr = lutil_strcopy( ptr, " size.pr=noEstimate " );
+               }
+               if ( lim->lms_s_pr ) {
+                       ptr = lutil_strcopy( ptr, " size.pr=" );
+                       if ( lim->lms_s_pr == -1 )
+                               ptr = lutil_strcopy( ptr, "unlimited" );
+                       else
+                               ptr += sprintf( ptr, "%d", lim->lms_s_pr );
+                       *ptr++ = ' ';
+               }
+               if ( lim->lms_s_pr_total ) {
+                       ptr = lutil_strcopy( ptr, " size.prtotal=" );
+                       if ( lim->lms_s_pr_total == -1 )
+                               ptr = lutil_strcopy( ptr, "unlimited" );
+                       else if ( lim->lms_s_pr_total == -2 )
+                               ptr = lutil_strcopy( ptr, "disabled" );
+                       else 
+                               ptr += sprintf( ptr, "%d", lim->lms_s_pr_total );
+                       *ptr++ = ' ';
+               }
+       }
+       if ( which & SLAP_LIMIT_TIME ) {
+               if ( lim->lms_t_soft != SLAPD_DEFAULT_TIMELIMIT ) {
+
+                       /* If same as global limit, drop it */
+                       if ( lim != &frontendDB->be_def_limit &&
+                               lim->lms_t_soft == frontendDB->be_def_limit.lms_t_soft )
+                               goto t_hard;
+
+                       /* If there's also a hard limit, fully qualify this one */
+                       else if ( lim->lms_t_hard ) 
+                               ptr = lutil_strcopy( ptr, " time.soft=" );
+
+                       /* If doing both size & time, qualify this */
+                       else if ( which & SLAP_LIMIT_SIZE )
+                               ptr = lutil_strcopy( ptr, " time=" );
+
+                       if ( lim->lms_t_soft == -1 )
+                               ptr = lutil_strcopy( ptr, "unlimited" );
+                       else
+                               ptr += sprintf( ptr, "%d", lim->lms_t_soft );
+                       *ptr++ = ' ';
+               }
+t_hard:
+               if ( lim->lms_t_hard ) {
+                       ptr = lutil_strcopy( ptr, " time.hard=" );
+                       if ( lim->lms_t_hard == -1 )
+                               ptr = lutil_strcopy( ptr, "unlimited" );
+                       else
+                               ptr += sprintf( ptr, "%d", lim->lms_t_hard );
+                       *ptr++ = ' ';
+               }
+       }
+       if ( ptr != bv->bv_val ) {
+               ptr--;
+               *ptr = '\0';
+               bv->bv_len = ptr - bv->bv_val;
+       }
+}
+
+int
+limits_check( Operation *op, SlapReply *rs )
+{
+       assert( op );
+       assert( rs );
+       /* FIXME: should this be always true? */
+       assert( op->o_tag == LDAP_REQ_SEARCH);
+
+       /* protocol only allows 0..maxInt;
+        *
+        * internal searches:
+        * - may use SLAP_NO_LIMIT ( = -1 ) to indicate no limits;
+        * - should use slimit = N and tlimit = SLAP_NO_LIMIT to
+        *   indicate searches that should return exactly N matches,
+        *   and handle errors thru a callback (see for instance
+        *   slap_sasl_match() and slap_sasl2dn())
+        */
+       if ( op->ors_tlimit == SLAP_NO_LIMIT && op->ors_slimit == SLAP_NO_LIMIT ) {
+               return 0;
+       }
+
+       /* allow root to set no limit */
+       if ( be_isroot( op ) ) {
+               op->ors_limit = NULL;
+
+               if ( op->ors_tlimit == 0 ) {
+                       op->ors_tlimit = SLAP_NO_LIMIT;
+               }
+
+               if ( op->ors_slimit == 0 ) {
+                       op->ors_slimit = SLAP_NO_LIMIT;
+               }
+
+       /* if not root, get appropriate limits */
+       } else {
+               ( void ) limits_get( op, &op->o_ndn, &op->ors_limit );
+
+               assert( op->ors_limit != NULL );
+
+               /* if no limit is required, use soft limit */
+               if ( op->ors_tlimit == 0 ) {
+                       op->ors_tlimit = op->ors_limit->lms_t_soft;
+
+               /* limit required: check if legal */
+               } else {
+                       if ( op->ors_limit->lms_t_hard == 0 ) {
+                               if ( op->ors_limit->lms_t_soft > 0
+                                               && ( op->ors_tlimit > op->ors_limit->lms_t_soft ) ) {
+                                       op->ors_tlimit = op->ors_limit->lms_t_soft;
+                               }
+
+                       } else if ( op->ors_limit->lms_t_hard > 0 ) {
+#ifdef ABOVE_HARD_LIMIT_IS_ERROR
+                               if ( op->ors_tlimit == SLAP_MAX_LIMIT ) {
+                                       op->ors_tlimit = op->ors_limit->lms_t_hard;
+
+                               } else if ( op->ors_tlimit > op->ors_limit->lms_t_hard ) {
+                                       /* error if exceeding hard limit */
+                                       rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+                                       send_ldap_result( op, rs );
+                                       rs->sr_err = LDAP_SUCCESS;
+                                       return -1;
+                               }
+#else /* ! ABOVE_HARD_LIMIT_IS_ERROR */
+                               if ( op->ors_tlimit > op->ors_limit->lms_t_hard ) {
+                                       op->ors_tlimit = op->ors_limit->lms_t_hard;
+                               }
+#endif /* ! ABOVE_HARD_LIMIT_IS_ERROR */
+                       }
+               }
+
+               /* else leave as is */
+
+               /* don't even get to backend if candidate check is disabled */
+               if ( op->ors_limit->lms_s_unchecked == 0 ) {
+                       rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+                       send_ldap_result( op, rs );
+                       rs->sr_err = LDAP_SUCCESS;
+                       return -1;
+               }
+
+               /* if paged results is requested */     
+               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 ) {
+                               rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+                               rs->sr_text = "pagedResults control not allowed";
+                               send_ldap_result( op, rs );
+                               rs->sr_err = LDAP_SUCCESS;
+                               rs->sr_text = NULL;
+                               return -1;
+                       }
+                       
+                       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 );
+                               rs->sr_err = LDAP_SUCCESS;
+                               rs->sr_text = NULL;
+                               return -1;
+                       }
+
+                       if ( op->ors_limit->lms_s_pr_total == 0 ) {
+                               if ( op->ors_limit->lms_s_hard == 0 ) {
+                                       pr_total = op->ors_limit->lms_s_soft;
+                               } else {
+                                       pr_total = op->ors_limit->lms_s_hard;
+                               }
+                       } else {
+                               pr_total = op->ors_limit->lms_s_pr_total;
+                       }
+
+                       if ( pr_total == -1 ) {
+                               if ( op->ors_slimit == 0 || op->ors_slimit == SLAP_MAX_LIMIT ) {
+                                       slimit = -1;
+
+                               } else {
+                                       slimit = op->ors_slimit - ps->ps_count;
+                               }
+
+#ifdef ABOVE_HARD_LIMIT_IS_ERROR
+                       } else if ( pr_total > 0 && op->ors_slimit != SLAP_MAX_LIMIT
+                                       && ( op->ors_slimit == SLAP_NO_LIMIT || op->ors_slimit > pr_total ) )
+                       {
+                               rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+                               send_ldap_result( op, rs );
+                               rs->sr_err = LDAP_SUCCESS;
+                               return -1;
+#endif /* ! ABOVE_HARD_LIMIT_IS_ERROR */
+       
+                       } else {
+                               /* if no limit is required, use soft limit */
+                               int     total;
+                               int     slimit2;
+
+                               /* first round of pagedResults: set count to any appropriate limit */
+
+                               /* if the limit is set, check that it does not violate any server-side limit */
+#ifdef ABOVE_HARD_LIMIT_IS_ERROR
+                               if ( op->ors_slimit == SLAP_MAX_LIMIT ) {
+                                       slimit2 = op->ors_slimit = pr_total;
+#else /* ! ABOVE_HARD_LIMIT_IS_ERROR */
+                               if ( op->ors_slimit == SLAP_MAX_LIMIT || op->ors_slimit > pr_total ) {
+                                       slimit2 = op->ors_slimit = pr_total;
+#endif /* ! ABOVE_HARD_LIMIT_IS_ERROR */
+
+                               } else if ( op->ors_slimit == 0 ) {
+                                       slimit2 = pr_total;
+
+                               } else {
+                                       slimit2 = op->ors_slimit;
+                               }
+
+                               total = slimit2 - ps->ps_count;
+
+                               if ( total >= 0 ) {
+                                       if ( op->ors_limit->lms_s_pr > 0 ) {
+                                               /* use the smallest limit set by total/per page */
+                                               if ( total < op->ors_limit->lms_s_pr ) {
+                                                       slimit = total;
+       
+                                               } else {
+                                                       /* use the perpage limit if any 
+                                                        * NOTE: + 1 because the given value must be legal */
+                                                       slimit = op->ors_limit->lms_s_pr + 1;
+                                               }
+
+                                       } else {
+                                               /* use the total limit if any */
+                                               slimit = total;
+                                       }
+
+                               } else if ( op->ors_limit->lms_s_pr > 0 ) {
+                                       /* use the perpage limit if any 
+                                        * NOTE: + 1 because the given value must be legal */
+                                       slimit = op->ors_limit->lms_s_pr + 1;
+
+                               } else {
+                                       /* use the standard hard/soft limit if any */
+                                       slimit = op->ors_limit->lms_s_hard;
+                               }
+                       }
+               
+                       /* if got any limit, use it */
+                       if ( slimit != -2 ) {
+                               if ( op->ors_slimit == 0 ) {
+                                       op->ors_slimit = slimit;
+
+                               } else if ( slimit > 0 ) {
+                                       if ( op->ors_slimit - ps->ps_count > slimit ) {
+                                               rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+                                               send_ldap_result( op, rs );
+                                               rs->sr_err = LDAP_SUCCESS;
+                                               return -1;
+                                       }
+                                       op->ors_slimit = slimit;
+                               }
+
+                       } else {
+                               /* use the standard hard/soft limit if any */
+                               op->ors_slimit = pr_total;
+                       }
+
+               /* no limit requested: use soft, whatever it is */
+               } else if ( op->ors_slimit == 0 ) {
+                       op->ors_slimit = op->ors_limit->lms_s_soft;
+
+               /* limit requested: check if legal */
+               } else {
+                       /* hard limit as soft (traditional behavior) */
+                       if ( op->ors_limit->lms_s_hard == 0 ) {
+                               if ( op->ors_limit->lms_s_soft > 0
+                                               && op->ors_slimit > op->ors_limit->lms_s_soft ) {
+                                       op->ors_slimit = op->ors_limit->lms_s_soft;
+                               }
+
+                       /* explicit hard limit: error if violated */
+                       } else if ( op->ors_limit->lms_s_hard > 0 ) {
+#ifdef ABOVE_HARD_LIMIT_IS_ERROR
+                               if ( op->ors_slimit == SLAP_MAX_LIMIT ) {
+                                       op->ors_slimit = op->ors_limit->lms_s_hard;
+
+                               } else if ( op->ors_slimit > op->ors_limit->lms_s_hard ) {
+                                       /* if limit exceeds hard, error */
+                                       rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+                                       send_ldap_result( op, rs );
+                                       rs->sr_err = LDAP_SUCCESS;
+                                       return -1;
+                               }
+#else /* ! ABOVE_HARD_LIMIT_IS_ERROR */
+                               if ( op->ors_slimit > op->ors_limit->lms_s_hard ) {
+                                       op->ors_slimit = op->ors_limit->lms_s_hard;
+                               }
+#endif /* ! ABOVE_HARD_LIMIT_IS_ERROR */
+                       }
+               }
+
+               /* else leave as is */
+       }
+
+       return 0;
+}
+