X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Ferror.c;h=3540828821567c841de4bc8b620e9cdfeef51ff0;hb=959edd88c0dc0ad558d9ebc423996c7a9d0f8cbc;hp=5780012bc7daecb41b615e0a8524cab3e865f5d3;hpb=97683ac5fd22927a5470d7f1b0836f20249f9c0b;p=openldap diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c index 5780012bc7..3540828821 100644 --- a/libraries/libldap/error.c +++ b/libraries/libldap/error.c @@ -1,5 +1,6 @@ +/* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -17,17 +18,17 @@ struct ldaperror { int e_code; - char *e_reason; + char *e_reason; }; -static const struct ldaperror ldap_errlist[] = { +static struct ldaperror ldap_builtin_errlist[] = { {LDAP_SUCCESS, "Success" }, {LDAP_OPERATIONS_ERROR, "Operations error" }, {LDAP_PROTOCOL_ERROR, "Protocol error" }, {LDAP_TIMELIMIT_EXCEEDED, "Time limit exceeded" }, {LDAP_SIZELIMIT_EXCEEDED, "Size limit exceeded" }, - {LDAP_COMPARE_FALSE, "Compare false" }, - {LDAP_COMPARE_TRUE, "Compare true" }, + {LDAP_COMPARE_FALSE, "Compare False" }, + {LDAP_COMPARE_TRUE, "Compare True" }, {LDAP_STRONG_AUTH_NOT_SUPPORTED, "Authentication method not supported" }, {LDAP_STRONG_AUTH_REQUIRED, "Strong authentication required" }, {LDAP_PARTIAL_RESULTS, "Partial results and referral received" }, @@ -49,7 +50,7 @@ static const struct ldaperror ldap_errlist[] = { {LDAP_NO_SUCH_OBJECT, "No such object" }, {LDAP_ALIAS_PROBLEM, "Alias problem" }, {LDAP_INVALID_DN_SYNTAX, "Invalid DN syntax" }, - {LDAP_IS_LEAF, "Object is a leaf" }, + {LDAP_IS_LEAF, "Entry is a leaf" }, {LDAP_ALIAS_DEREF_PROBLEM, "Alias dereferencing problem" }, {LDAP_INAPPROPRIATE_AUTH, "Inappropriate authentication" }, @@ -70,6 +71,8 @@ static const struct ldaperror ldap_errlist[] = { {LDAP_AFFECTS_MULTIPLE_DSAS, "Operation affects multiple DSAs" }, {LDAP_OTHER, "Unknown error" }, + + /* API ResultCodes */ {LDAP_SERVER_DOWN, "Can't contact LDAP server" }, {LDAP_LOCAL_ERROR, "Local error" }, {LDAP_ENCODING_ERROR, "Encoding error" }, @@ -89,16 +92,50 @@ static const struct ldaperror ldap_errlist[] = { {LDAP_CLIENT_LOOP, "Client Loop" }, {LDAP_REFERRAL_LIMIT_EXCEEDED, "Referral Limit Exceeded" }, - {-1, 0 } + {-1, NULL} }; -static struct ldaperror *ldap_int_error( int err ) +static struct ldaperror *ldap_errlist = ldap_builtin_errlist; + +void ldap_int_error_init( void ) { +#ifdef LDAP_NLS +#define LDAP_NLS_SDK_CAT "openldap_sdk" +#define LDAP_NLS_LIBLDAP_SET (0) + + int i; + nl_catd catd = catopen( LDAP_NLS_SDK_CAT, NL_CAT_LOCALE ); + + if( catd == -1 ) { + return; + } + + for ( i=0; ldap_errlist[i].e_reason != NULL; i++ ) { + char *msg = catgets( catd, + LDAP_NLS_LIBLDAP_SET, + ldap_errlist[i].e_code, NULL ); + + if( msg != NULL ) { + msg = LDAP_STRDUP( msg ); + + if( msg != NULL ) { + ldap_errlist[i].e_reason = msg; + } + } + } + + catclose( catd ); +#endif +} + +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]; + for ( i=0; ldap_errlist[i].e_reason != NULL; i++ ) { + if ( err == ldap_errlist[i].e_code ) { + return &ldap_errlist[i]; + } } return NULL; @@ -107,57 +144,50 @@ 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 ); e = ldap_int_error( err ); - return ( e != NULL ) ? e->e_reason : "Unknown error"; + return e ? e->e_reason : "Unknown error"; } /* deprecated */ 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 ); assert( LDAP_VALID( ld ) ); assert( str ); - s = ( str != NULL ) ? str : "ldap_perror"; - if ( ld == NULL ) { - perror( s ); + fprintf( stderr, "ldap_perror: invalid session handle\n" ); return; } e = ldap_int_error( ld->ld_errno ); - if ( e != NULL ) { - fprintf( stderr, "%s: %s\n", - s, e->e_reason ); - } else { - fprintf( stderr, "%s: unknown LDAP error number %d\n", - s, ld->ld_errno ); - } + fprintf( stderr, "%s: %s (%d)\n", + str ? str : "ldap_perror", + e ? e->e_reason : "unknown LDAP result code", + ld->ld_errno ); if ( ld->ld_matched != NULL && ld->ld_matched[0] != '\0' ) { - fprintf( stderr, "\tmatched: \"%s\"\n", - ld->ld_matched ); + fprintf( stderr, "\tmatched DN: %s\n", ld->ld_matched ); } if ( ld->ld_error != NULL && ld->ld_error[0] != '\0' ) { - fprintf( stderr, "\tadditional info: %s\n", - ld->ld_error ); + fprintf( stderr, "\tadditional info: %s\n", ld->ld_error ); } fflush( stderr ); } +/* deprecated */ int ldap_result2error( LDAP *ld, LDAPMessage *r, int freeit ) { @@ -166,7 +196,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,11 +234,8 @@ 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; BerElement *ber; @@ -222,16 +249,18 @@ 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; if(serverctrls != NULL) *serverctrls = NULL; /* Find the next result... */ - for ( lm = r; lm->lm_chain != NULL; lm = lm->lm_chain ) { + for ( lm = r; lm != NULL; lm = lm->lm_chain ) { /* skip over entries and references */ if( lm->lm_msgtype != LDAP_RES_SEARCH_ENTRY && - lm->lm_msgtype != LDAP_RES_SEARCH_REFERENCE ) + lm->lm_msgtype != LDAP_RES_SEARCH_REFERENCE && + lm->lm_msgtype != LDAP_RES_EXTENDED_PARTIAL ) { break; } @@ -242,10 +271,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 +286,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 */ @@ -306,7 +331,7 @@ ldap_parse_result( } if( tag != LBER_ERROR ) { - rc = ldap_int_get_controls( ber, serverctrls ); + int rc = ldap_int_get_controls( ber, serverctrls ); if( rc != LDAP_SUCCESS ) { tag = LBER_ERROR; @@ -319,7 +344,7 @@ ldap_parse_result( } if ( tag == LBER_ERROR ) { - errcode = LDAP_DECODING_ERROR; + ld->ld_errno = errcode = LDAP_DECODING_ERROR; } if( ber != NULL ) { @@ -327,10 +352,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 ); } @@ -342,7 +367,8 @@ ldap_parse_result( for ( lm = lm->lm_chain; lm != NULL; lm = lm->lm_chain ) { /* skip over entries and references */ if( lm->lm_msgtype != LDAP_RES_SEARCH_ENTRY && - lm->lm_msgtype != LDAP_RES_SEARCH_REFERENCE ) + lm->lm_msgtype != LDAP_RES_SEARCH_REFERENCE && + lm->lm_msgtype != LDAP_RES_EXTENDED_PARTIAL ) { /* more results to return */ errcode = LDAP_MORE_RESULTS_TO_RETURN; @@ -355,6 +381,5 @@ ldap_parse_result( ldap_msgfree( r ); } - ld->ld_errno = errcode; - return( ld->ld_errno ); + return( errcode ); }