allow continuous mode

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 8e0a632133c593a19bb1fac4c421b7233942183c..174633e4105f2944e082ace898957048342da894 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -979,9 +979,8 @@ getNextPage:
                        attrs, attrsonly, NULL, NULL, NULL, -1 );
 
        } else {
-               rc = 0;
                first = 1;
-               while ( rc == 0 && fgets( line, sizeof( line ), fp ) != NULL ) { 
+               while ( fgets( line, sizeof( line ), fp ) != NULL ) { 
                        line[ strlen( line ) - 1 ] = '\0';
                        if ( !first ) {
                                putchar( '\n' );
@@ -990,6 +989,10 @@ getNextPage:
                        }
                        rc = dosearch( ld, base, scope, filtpattern, line,
                                attrs, attrsonly, NULL, NULL, NULL, -1 );
+
+                       if ( rc != 0 && !contoper ) {
+                               break;
+                       }
                }
                if ( fp != stdin ) {
                        fclose( fp );

diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1
index 65ed177d1979b4fc9d7bf77c8db258e8944ecedc..7d5997ae210bcbd56ce038173d6d21ba4e8cadfb 100644 (file)
--- a/doc/man/man1/ldapsearch.1
+++ b/doc/man/man1/ldapsearch.1
@@ -9,6 +9,8 @@ ldapsearch \- LDAP search tool
 [\c
 .BR \-n ]
 [\c
+.BR \-c ]
+[\c
 .BR \-u ]
 [\c
 .BR \-v ]
@@ -106,6 +108,11 @@ If no \fIattrs\fP are listed, all user attributes are returned.  If only
 Show what would be done, but don't actually perform the search.  Useful for
 debugging in conjunction with -v.
 .TP
+.B \-c
+Continuous operation mode. Errors are reported, but ldapsearch will continue
+with searches. The default is to exit after reporting an error.  Only useful
+in conjunction with -f.
+.TP
 .B \-u
 Include the User Friendly Name form of the Distinguished Name (DN)
 in the output.
@@ -172,6 +179,9 @@ Where it is desired that the search filter include a \fB%\fP character,
 the character should be encoded as \fB\\25\fP (see RFC 4515).
 If \fIfile\fP is a single
 \fI-\fP character, then the lines are read from standard input.
+.B ldapsearch
+will exit when the first non-successful search result is returned,
+unless -c is used.
 .TP
 .B \-x 
 Use simple authentication instead of SASL.