+/* $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
*/
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" },
{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" },
{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" },
{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;
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 ) {
- fprintf( stderr, "\tmatched: \"%s\"\n",
- ld->ld_matched );
+ if ( ld->ld_matched != NULL && ld->ld_matched[0] != '\0' ) {
+ fprintf( stderr, "\tmatched DN: %s\n", ld->ld_matched );
}
- if ( ld->ld_error != NULL ) {
- fprintf( stderr, "\tadditional info: %s\n",
- ld->ld_error );
+ if ( ld->ld_error != NULL && ld->ld_error[0] != '\0' ) {
+ fprintf( stderr, "\tadditional info: %s\n", ld->ld_error );
}
fflush( stderr );
}
+/* deprecated */
int
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;
}
/*
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;
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;
}
return ld->ld_errno;
}
- errcode = LDAP_SUCCESS;
- matcheddn = NULL;
- errmsg = NULL;
-
if ( ld->ld_error ) {
LDAP_FREE( ld->ld_error );
ld->ld_error = NULL;
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 */
}
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;
}
if ( tag == LBER_ERROR ) {
- errcode = LDAP_DECODING_ERROR;
+ ld->ld_errno = errcode = LDAP_DECODING_ERROR;
}
if( ber != NULL ) {
}
/* 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 );
}
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;
ldap_msgfree( r );
}
- ld->ld_errno = errcode;
- return( ld->ld_errno );
+ return( errcode );
}
projects / openldap / blobdiff