fix previous commit (ITS#3905)

[openldap] / clients / tools / ldapcompare.c

diff --git a/clients/tools/ldapcompare.c b/clients/tools/ldapcompare.c
index e9d8d0a01f146f196e91cde2b1499661f9f64f02..619b7e811a574d56c94631b75ef71d041c517377 100644 (file)
--- a/clients/tools/ldapcompare.c
+++ b/clients/tools/ldapcompare.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 1998-2001 Net Boolean Incorporated.
  * All rights reserved.
@@ -46,6 +46,7 @@
 #include <ac/string.h>
 #include <ac/unistd.h>
 #include <ac/errno.h>
+#include <ac/time.h>
 #include <sys/stat.h>
 
 #ifdef HAVE_FCNTL_H
@@ -107,7 +108,7 @@ handle_private_option( int i )
 #if 0
                char    *control, *cvalue;
                int             crit;
-       case 'E': /* compare controls */
+       case 'E': /* compare extensions */
                if( protocol == LDAP_VERSION2 ) {
                        fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
                                prog, protocol );
@@ -129,7 +130,7 @@ handle_private_option( int i )
                if ( (cvalue = strchr( control, '=' )) != NULL ) {
                        *cvalue++ = '\0';
                }
-               fprintf( stderr, _("Invalid compare control name: %s\n"), control );
+               fprintf( stderr, _("Invalid compare extension name: %s\n"), control );
                usage();
 #endif
 
@@ -217,8 +218,8 @@ main( int argc, char **argv )
 
        free( bvalue.bv_val );
 
-       ldap_unbind_ext( ld, NULL, NULL );
-
+       tool_unbind( ld );
+       tool_destroy();
        return rc;
 }
 
@@ -232,26 +233,88 @@ static int docompare(
        LDAPControl **sctrls,
        LDAPControl **cctrls )
 {
-       int                     rc;
+       int             rc, msgid, code;
+       LDAPMessage     *res;
+       char            *matcheddn;
+       char            *text;
+       char            **refs;
 
        if ( not ) {
                return LDAP_SUCCESS;
        }
 
-       rc = ldap_compare_ext_s( ld, dn, attr, bvalue,
-               sctrls, cctrls );
+       rc = ldap_compare_ext( ld, dn, attr, bvalue,
+               sctrls, cctrls, &msgid );
+       if ( rc == -1 ) {
+               return( rc );
+       }
+
+       for ( ; ; ) {
+               struct timeval  tv;
+
+               tv.tv_sec = 0;
+               tv.tv_usec = 100000;
+
+               if ( tool_check_abandon( ld, msgid ) ) {
+                       return LDAP_CANCELLED;
+               }
+
+               rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, &tv, &res );
+               if ( rc < 0 ) {
+                       ldap_perror( ld, "ldapcompare: ldap_result" );
+                       return rc;
+               }
+
+               if ( rc != 0 ) {
+                       break;
+               }
+       }
+
+       rc = ldap_parse_result( ld, res, &code, &matcheddn, &text, &refs, NULL, 1 );
+
+       if( rc != LDAP_SUCCESS ) {
+               fprintf( stderr, "%s: ldap_parse_result: %s (%d)\n",
+                       prog, ldap_err2string( rc ), rc );
+               return rc;
+       }
+
+       if ( !quiet && ( verbose || ( code != LDAP_SUCCESS && code != LDAP_COMPARE_TRUE && code != LDAP_COMPARE_FALSE )||
+               (matcheddn && *matcheddn) || (text && *text) || (refs && *refs) ) )
+       {
+               printf( _("Compare Result: %s (%d)\n"),
+                       ldap_err2string( code ), code );
+
+               if( text && *text ) {
+                       printf( _("Additional info: %s\n"), text );
+               }
+
+               if( matcheddn && *matcheddn ) {
+                       printf( _("Matched DN: %s\n"), matcheddn );
+               }
+
+               if( refs ) {
+                       int i;
+                       for( i=0; refs[i]; i++ ) {
+                               printf(_("Referral: %s\n"), refs[i] );
+                       }
+               }
+       }
+
+       ber_memfree( text );
+       ber_memfree( matcheddn );
+       ber_memvfree( (void **) refs );
 
        /* if we were told to be quiet, use the return value. */
        if ( !quiet ) {
-               if ( rc == LDAP_COMPARE_TRUE ) {
+               if ( code == LDAP_COMPARE_TRUE ) {
                        printf(_("TRUE\n"));
-               } else if ( rc == LDAP_COMPARE_FALSE ) {
+               } else if ( code == LDAP_COMPARE_FALSE ) {
                        printf(_("FALSE\n"));
                } else {
-                       ldap_perror( ld, "ldap_compare" );
+                       printf(_("UNDEFINED\n"));
                }
        }
 
-       return( rc );
+       return( code );
 }