improve tester_ldap_error

diff --git a/tests/progs/slapd-common.c b/tests/progs/slapd-common.c
index ec401084fa2c81326f3eecc17639e4483e5bf0f7..4bcc23644f735cab4ed3fe6a85529c4ef272af96 100644 (file)
--- a/tests/progs/slapd-common.c
+++ b/tests/progs/slapd-common.c
@@ -53,16 +53,59 @@ tester_uri( char *uri, char *host, int port )
 void
 tester_ldap_error( LDAP *ld, const char *fname )
 {
-       int err;
-       const char *text = "Success";
+       int             err;
+       char            *text = NULL;
+       LDAPControl     **ctrls = NULL;
 
        ldap_get_option( ld, LDAP_OPT_RESULT_CODE, (void *)&err );
        if ( err != LDAP_SUCCESS ) {
                ldap_get_option( ld, LDAP_OPT_ERROR_STRING, (void *)&text );
        }
 
-       fprintf( stderr, "%s: %s: (%d) %s\n",
-                       progname, fname, err, text == NULL ? "" : text );
+       fprintf( stderr, "%s: %s: %s (%d) %s\n",
+               progname, fname, ldap_err2string( err ), err,
+               text == NULL ? "" : text );
+
+       if ( text ) {
+               ldap_memfree( text );
+               text = NULL;
+       }
+
+       ldap_get_option( ld, LDAP_OPT_MATCHED_DN, (void *)&text );
+       if ( text != NULL ) {
+               fprintf( stderr, "\tmatched: %s\n", text );
+               ldap_memfree( text );
+               text = NULL;
+       }
+
+       ldap_get_option( ld, LDAP_OPT_SERVER_CONTROLS, (void *)&ctrls );
+       if ( ctrls != NULL ) {
+               int     i;
+
+               fprintf( stderr, "\tcontrols:\n" );
+               for ( i = 0; ctrls[ i ] != NULL; i++ ) {
+                       fprintf( stderr, "\t\t%s\n", ctrls[ i ]->ldctl_oid );
+               }
+               ldap_controls_free( ctrls );
+               ctrls = NULL;
+       }
+
+       if ( err == LDAP_REFERRAL ) {
+               char **refs = NULL;
+
+               ldap_get_option( ld, LDAP_OPT_REFERRAL_URLS, (void *)&refs );
+
+               if ( refs ) {
+                       int     i;
+
+                       fprintf( stderr, "\treferral:\n" );
+                       for ( i = 0; refs[ i ] != NULL; i++ ) {
+                               fprintf( stderr, "\t\t%s\n", refs[ i ] );
+                       }
+
+                       ber_memvfree( (void **)refs );
+               }
+       }
 }
 
 void