use keyword "unlimited" instead of -1 for no limits

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 8049673bd4279da757602398d99be4c2b1eb629d..62998f74210a7ce215138e87ded537e760b6aa2c 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -712,7 +712,7 @@ Note that the
 factor is measure of security provided by the underlying transport,
 e.g. ldapi:// (and eventually IPSEC).  It is not normally used.
 .TP
-.B sizelimit <integer> 
+.B sizelimit {<integer>|unlimited}
 .TP
 .B sizelimit size[.{soft|hard|unchecked}]=<integer> [...]
 Specify the maximum number of entries to return from a search operation.
@@ -740,7 +740,7 @@ meaningful if you are using Kerberos authentication.
 Specify the maximum size of the primary thread pool.
 The default is 32.
 .TP
-.B timelimit <integer>
+.B timelimit {<integer>|unlimited}
 .TP
 .B timelimit time[.{soft|hard}]=<integer> [...]
 Specify the maximum number of seconds (in real time)

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index ec599721838d9b991d8b65e63296881f625ffc71..55d6191939be03576d7848217abe3ea79a4354a0 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -664,25 +664,55 @@ read_config( const char *fname, int depth )
                        for ( i = 1; i < cargc; i++ ) {
                                if ( strncasecmp( cargv[i], "size", 4 ) == 0 ) {
                                        rc = parse_limit( cargv[i], lim );
+                                       if ( rc ) {
+#ifdef NEW_LOGGING
+                                               LDAP_LOG( CONFIG, CRIT, 
+                                                       "%s: line %d: unable "
+                                                          "to parse value \"%s\" in \"sizelimit "
+                                                          "<limit>\" line.\n", fname, lineno, cargv[i] );
+#else
+                                               Debug( LDAP_DEBUG_ANY,
+                                                       "%s: line %d: unable "
+                                                       "to parse value \"%s\" "
+                                                       "in \"sizelimit "
+                                                       "<limit>\" line\n",
+                                                       fname, lineno, cargv[i] );
+#endif
+                                               return( 1 );
+                                       }
+
                                } else {
-                                       lim->lms_s_soft = atoi( cargv[i] );
-                                       lim->lms_s_hard = 0;
-                               }
+                                       if ( strcasecmp( cargv[i], "unlimited" ) == 0 ) {
+                                               lim->lms_s_soft = -1;
+                                       } else {
+                                               char *next;
 
-                               if ( rc ) {
+                                               lim->lms_s_soft = strtol( cargv[i] , &next, 0 );
+                                               if ( next == cargv[i] ) {
 #ifdef NEW_LOGGING
-                                       LDAP_LOG( CONFIG, CRIT, 
-                                               "%s: line %d: unable "
-                                                  "to parse value \"%s\" in \"sizelimit "
-                                                  "<limit>\" line.\n", fname, lineno, cargv[i] );
+                                                       LDAP_LOG( CONFIG, CRIT, 
+                                                          "%s: line %d: unable to parse limit \"%s\" in \"sizelimit <limit>\" "
+                                                          "line.\n", fname, lineno, cargv[i] );
 #else
-                                       Debug( LDAP_DEBUG_ANY,
-                                               "%s: line %d: unable "
-                                               "to parse value \"%s\" "
-                                               "in \"sizelimit "
-                                               "<limit>\" line\n",
-                                               fname, lineno, cargv[i] );
+                                                       Debug( LDAP_DEBUG_ANY,
+                                                           "%s: line %d: unable to parse limit \"%s\" in \"sizelimit <limit>\" line\n",
+                                                           fname, lineno, cargv[i] );
+#endif
+                                                       return( 1 );
+
+                                               } else if ( next[0] != '\0' ) {
+#ifdef NEW_LOGGING
+                                                       LDAP_LOG( CONFIG, CRIT, 
+                                                          "%s: line %d: trailing chars \"%s\" in \"sizelimit <limit>\" "
+                                                          "line ignored.\n", fname, lineno, next );
+#else
+                                                       Debug( LDAP_DEBUG_ANY,
+                                                           "%s: line %d: trailing chars \"%s\" in \"sizelimit <limit>\" line ignored\n",
+                                                           fname, lineno, next );
 #endif
+                                               }
+                                       }
+                                       lim->lms_s_hard = 0;
                                }
                        }
 
@@ -714,25 +744,55 @@ read_config( const char *fname, int depth )
                        for ( i = 1; i < cargc; i++ ) {
                                if ( strncasecmp( cargv[i], "time", 4 ) == 0 ) {
                                        rc = parse_limit( cargv[i], lim );
+                                       if ( rc ) {
+#ifdef NEW_LOGGING
+                                               LDAP_LOG( CONFIG, CRIT, 
+                                                           "%s: line %d: unable to parse value \"%s\" "
+                                                          "in \"timelimit <limit>\" line.\n",
+                                                          fname, lineno, cargv[i] );
+#else
+                                               Debug( LDAP_DEBUG_ANY,
+                                                       "%s: line %d: unable "
+                                                       "to parse value \"%s\" "
+                                                       "in \"timelimit "
+                                                       "<limit>\" line\n",
+                                                       fname, lineno, cargv[i] );
+#endif
+                                               return( 1 );
+                                       }
+
                                } else {
-                                       lim->lms_t_soft = atoi( cargv[i] );
-                                       lim->lms_t_hard = 0;
-                               }
+                                       if ( strcasecmp( cargv[i], "unlimited" ) == 0 ) {
+                                               lim->lms_t_soft = -1;
+                                       } else {
+                                               char *next;
 
-                               if ( rc ) {
+                                               lim->lms_t_soft = strtol( cargv[i] , &next, 0 );
+                                               if ( next == cargv[i] ) {
 #ifdef NEW_LOGGING
-                                       LDAP_LOG( CONFIG, CRIT, 
-                                                   "%s: line %d: unable to parse value \"%s\" "
-                                                  "in \"timelimit <limit>\" line.\n",
-                                                  fname, lineno, cargv[i] );
+                                                       LDAP_LOG( CONFIG, CRIT, 
+                                                          "%s: line %d: unable to parse limit \"%s\" in \"timelimit <limit>\" "
+                                                          "line.\n", fname, lineno, cargv[i] );
 #else
-                                       Debug( LDAP_DEBUG_ANY,
-                                               "%s: line %d: unable "
-                                               "to parse value \"%s\" "
-                                               "in \"timelimit "
-                                               "<limit>\" line\n",
-                                               fname, lineno, cargv[i] );
+                                                       Debug( LDAP_DEBUG_ANY,
+                                                           "%s: line %d: unable to parse limit \"%s\" in \"timelimit <limit>\" line\n",
+                                                           fname, lineno, cargv[i] );
+#endif
+                                                       return( 1 );
+
+                                               } else if ( next[0] != '\0' ) {
+#ifdef NEW_LOGGING
+                                                       LDAP_LOG( CONFIG, CRIT, 
+                                                          "%s: line %d: trailing chars \"%s\" in \"timelimit <limit>\" "
+                                                          "line ignored.\n", fname, lineno, next );
+#else
+                                                       Debug( LDAP_DEBUG_ANY,
+                                                           "%s: line %d: trailing chars \"%s\" in \"timelimit <limit>\" line ignored\n",
+                                                           fname, lineno, next );
 #endif
+                                               }
+                                       }
+                                       lim->lms_t_hard = 0;
                                }
                        }