ITS#399: timelimit/timeout handling

[openldap] / libraries / libldap / error.c

diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c
index 0c58e185076932b1e3e56cca7445a44ad1ffc1b2..d1fefd66dfe3b0506b53e679829bc77987dd4027 100644 (file)
--- a/libraries/libldap/error.c
+++ b/libraries/libldap/error.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -92,13 +93,14 @@ static const struct ldaperror ldap_errlist[] = {
        {-1, 0 }
 };
 
-static struct ldaperror *ldap_int_error( int err )
+static const struct ldaperror *
+ldap_int_error( int err )
 {
        int     i;
 
        for ( i = 0; ldap_errlist[i].e_code != -1; i++ ) {
                if ( err == ldap_errlist[i].e_code )
-                       return (struct ldaperror *) &ldap_errlist[i];
+                       return &ldap_errlist[i];
        }
 
        return NULL;
@@ -107,7 +109,7 @@ static struct ldaperror *ldap_int_error( int err )
 char *
 ldap_err2string( int err )
 {
-       struct ldaperror *e;
+       const struct ldaperror *e;
        
        Debug( LDAP_DEBUG_TRACE, "ldap_err2string\n", 0, 0, 0 );
 
@@ -121,7 +123,7 @@ void
 ldap_perror( LDAP *ld, LDAP_CONST char *str )
 {
        const char *s;
-       struct ldaperror *e;
+       const struct ldaperror *e;
        Debug( LDAP_DEBUG_TRACE, "ldap_perror\n", 0, 0, 0 );
 
        assert( ld != NULL );
@@ -145,12 +147,12 @@ ldap_perror( LDAP *ld, LDAP_CONST char *str )
                        s, ld->ld_errno );
        }
 
-       if ( ld->ld_matched != NULL ) {
+       if ( ld->ld_matched != NULL && ld->ld_matched[0] != '\0' ) {
                fprintf( stderr, "\tmatched: \"%s\"\n",
                        ld->ld_matched );
        }
 
-       if ( ld->ld_error != NULL ) {
+       if ( ld->ld_error != NULL && ld->ld_error[0] != '\0' ) {
                fprintf( stderr, "\tadditional info: %s\n",
                    ld->ld_error );
        }
@@ -158,6 +160,7 @@ ldap_perror( LDAP *ld, LDAP_CONST char *str )
        fflush( stderr );
 }
 
+/* deprecated */
 int
 ldap_result2error( LDAP *ld, LDAPMessage *r, int freeit )
 {
@@ -166,7 +169,7 @@ ldap_result2error( LDAP *ld, LDAPMessage *r, int freeit )
        rc = ldap_parse_result( ld, r, &err,
                NULL, NULL, NULL, NULL, freeit );
 
-       return rc != LDAP_SUCCESS ? err : rc;
+       return err != LDAP_SUCCESS ? err : rc;
 }
 
 /*
@@ -204,9 +207,7 @@ ldap_parse_result(
        int                             freeit )
 {
        LDAPMessage     *lm;
-       ber_int_t errcode;
-       char* matcheddn;
-       char* errmsg;
+       ber_int_t errcode = LDAP_SUCCESS;
 
        int rc;
        ber_tag_t tag;
@@ -222,6 +223,7 @@ ldap_parse_result(
                return LDAP_PARAM_ERROR;
        }
 
+       if(errcodep != NULL) *errcodep = LDAP_SUCCESS;
        if(matcheddnp != NULL) *matcheddnp = NULL;
        if(errmsgp != NULL) *errmsgp = NULL;
        if(referralsp != NULL) *referralsp = NULL;
@@ -242,10 +244,6 @@ ldap_parse_result(
                return ld->ld_errno;
        }
 
-       errcode = LDAP_SUCCESS;
-       matcheddn = NULL;
-       errmsg = NULL;
-
        if ( ld->ld_error ) {
                LDAP_FREE( ld->ld_error );
                ld->ld_error = NULL;
@@ -261,11 +259,11 @@ ldap_parse_result(
 
        if ( ld->ld_version < LDAP_VERSION2 ) {
                tag = ber_scanf( ber, "{ia}",
-                       &errcode, &ld->ld_error );
+                       &ld->ld_errno, &ld->ld_error );
        } else {
                ber_len_t len;
                tag = ber_scanf( ber, "{iaa" /*}*/,
-                       &errcode, &ld->ld_matched, &ld->ld_error );
+                       &ld->ld_errno, &ld->ld_matched, &ld->ld_error );
 
                if( tag != LBER_ERROR ) {
                        /* peek for referrals */
@@ -319,7 +317,7 @@ ldap_parse_result(
        }
 
        if ( tag == LBER_ERROR ) {
-               errcode = LDAP_DECODING_ERROR;
+               ld->ld_errno = errcode = LDAP_DECODING_ERROR;
        }
 
        if( ber != NULL ) {
@@ -327,10 +325,10 @@ ldap_parse_result(
        }
 
        /* return */
+       if( errcodep != NULL ) {
+               *errcodep = ld->ld_errno;
+       }
        if ( errcode == LDAP_SUCCESS ) {
-               if( errcodep != NULL ) {
-                       *errcodep = ld->ld_errno;
-               }
                if( matcheddnp != NULL ) {
                        *matcheddnp = LDAP_STRDUP( ld->ld_matched );
                }
@@ -355,6 +353,5 @@ ldap_parse_result(
                ldap_msgfree( r );
        }
 
-       ld->ld_errno = errcode;
-       return( ld->ld_errno );
+       return( errcode );
 }