Be a bit more liberal

[openldap] / clients / tools / ldapsearch.c

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index b9b7affac1a21955ea1acdb17d315b86d2b6310e..dd47ecbb03f6cdb0b942dd010c6971e5b9ae2461 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -135,7 +135,7 @@ static int dosearch LDAP_P((
        int             attrsonly,
        LDAPControl **sctrls,
        LDAPControl **cctrls,
-       struct timeval *timelimit,
+       struct timeval *timeout,
        int     sizelimit ));
 
 static char *tmpdir = NULL;
@@ -222,6 +222,11 @@ main( int argc, char **argv )
                break;
        case 'l':       /* time limit */
                timelimit = atoi( optarg );
+               if( timelimit < 0 ) {
+                       fprintf( stderr, "%s: invalid timelimit (%d) specified\n",
+                               prog, timelimit );
+                       return EXIT_FAILURE;
+               }
                break;
        case 'L':       /* print entries in LDIF format */
                ++ldif;
@@ -831,7 +836,8 @@ main( int argc, char **argv )
        }
 
        if (ldif < 2 ) {
-               printf( "#\n# filter%s: %s\n# requesting: ",
+               printf( "#\n# LDAPv%d\n# filter%s: %s\n# requesting: ",
+                       version,
                        infile != NULL ? " pattern" : "",
                        filtpattern );
 
@@ -888,7 +894,7 @@ static int dosearch(
        int             attrsonly,
        LDAPControl **sctrls,
        LDAPControl **cctrls,
-       struct timeval *timelimit,
+       struct timeval *timeout,
        int sizelimit )
 {
        char            filter[ BUFSIZ ];
@@ -921,7 +927,7 @@ static int dosearch(
        }
 
        rc = ldap_search_ext( ld, base, scope, filter, attrs, attrsonly,
-               sctrls, cctrls, timelimit, sizelimit, &msgid );
+               sctrls, cctrls, timeout, sizelimit, &msgid );
 
        if( rc != LDAP_SUCCESS ) {
                fprintf( stderr, "%s: ldap_search_ext: %s (%d)\n",