helper for unlimited time/size limits request

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 91a4ce2dd6ee1e13bf5a1c26d5ea6442e6eb6eca..27f38438e7fb7b65435087f03eae2bf30f85df72 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -428,7 +428,12 @@ handle_private_option( int i )
                urlpre = strdup( optarg );
                break;
        case 'l':       /* time limit */
-               timelimit = atoi( optarg );
+               if ( strcasecmp( optarg, "none" ) == 0 ) {
+                       /* maxInt as per RFC 4.1.1. Message Envelope */
+                       sizelimit = 2147483647;
+               } else {
+                       timelimit = atoi( optarg );
+               }
                if( timelimit < 0 ) {
                        fprintf( stderr, _("%s: invalid timelimit (%d) specified\n"),
                                prog, timelimit );
@@ -470,7 +475,12 @@ handle_private_option( int i )
                ++includeufn;
                break;
        case 'z':       /* size limit */
-               sizelimit = atoi( optarg );
+               if ( strcasecmp( optarg, "none" ) == 0 ) {
+                       /* maxInt as per RFC 4.1.1. Message Envelope */
+                       sizelimit = 2147483647;
+               } else {
+                       sizelimit = atoi( optarg );
+               }
                break;
        default:
                return 0;

diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1
index d68743997964e51a788a6d1707f0a0cc3e79831c..fbdd2f53f5839cf215f582ae3a3a9e9aa848e0c4 100644 (file)
--- a/doc/man/man1/ldapsearch.1
+++ b/doc/man/man1/ldapsearch.1
@@ -227,6 +227,11 @@ timelimit of
 (zero) removes the
 .B ldap.conf
 limit.
+A timelimit of
+.I none
+uses
+.I maxInt
+(2147483647, RFC 2251) as timelimit.
 A server may impose a maximal timelimit which only
 the root user may override.
 .TP
@@ -237,6 +242,11 @@ of
 (zero) removes the 
 .B ldap.conf
 limit.
+A sizelimit of
+.I none
+uses
+.I maxInt
+(2147483647, RFC 2251) as sizelimit.
 A server may impose a maximal sizelimit which only
 the root user may override.
 .TP