/* $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_STRONG_AUTH_REQUIRED, "Strong(er) authentication required" },
{LDAP_PARTIAL_RESULTS, "Partial results and referral received" },
{LDAP_REFERRAL, "Referral"},
{LDAP_ADMINLIMIT_EXCEEDED, "Administrative limit exceeded"},
{LDAP_UNAVAILABLE_CRITICAL_EXTENSION,
- "Criticial extension is unavailable"},
+ "Critical extension is unavailable"},
{LDAP_CONFIDENTIALITY_REQUIRED, "Confidentiality required"},
{LDAP_SASL_BIND_IN_PROGRESS, "SASL bind in progress"},
{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_INVALID_CREDENTIALS, "Invalid credentials" },
{LDAP_INSUFFICIENT_ACCESS, "Insufficient access" },
- {LDAP_BUSY, "DSA is busy" },
- {LDAP_UNAVAILABLE, "DSA is unavailable" },
- {LDAP_UNWILLING_TO_PERFORM, "DSA is unwilling to perform" },
+ {LDAP_BUSY, "Server is busy" },
+ {LDAP_UNAVAILABLE, "Server is unavailable" },
+ {LDAP_UNWILLING_TO_PERFORM, "Server is unwilling to perform" },
{LDAP_LOOP_DETECT, "Loop detected" },
{LDAP_NAMING_VIOLATION, "Naming violation" },
{LDAP_OBJECT_CLASS_VIOLATION, "Object class violation" },
- {LDAP_NOT_ALLOWED_ON_NONLEAF, "Operation not allowed on nonleaf" },
+ {LDAP_NOT_ALLOWED_ON_NONLEAF, "Operation not allowed on non-leaf" },
{LDAP_NOT_ALLOWED_ON_RDN, "Operation not allowed on RDN" },
{LDAP_ALREADY_EXISTS, "Already exists" },
{LDAP_NO_OBJECT_CLASS_MODS, "Cannot modify object class" },
{LDAP_RESULTS_TOO_LARGE, "Results too large" },
{LDAP_AFFECTS_MULTIPLE_DSAS, "Operation affects multiple DSAs" },
- {LDAP_OTHER, "Unknown error" },
+ {LDAP_OTHER, "Internal (implementation specific) 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_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 )
+ for ( i=0; ldap_errlist[i].e_reason != NULL; i++ ) {
+ if ( err == ldap_errlist[i].e_code ) {
return &ldap_errlist[i];
+ }
}
return NULL;
{
const struct ldaperror *e;
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ENTRY, "ldap_err2string\n", 0,0,0 );
+#else
Debug( LDAP_DEBUG_TRACE, "ldap_err2string\n", 0, 0, 0 );
+#endif
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;
const struct ldaperror *e;
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ENTRY, "ldap_perror\n", 0,0,0 );
+#else
Debug( LDAP_DEBUG_TRACE, "ldap_perror\n", 0, 0, 0 );
+#endif
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
assert( str );
- s = ( str != NULL ) ? str : "ldap_perror";
-
- if ( ld == NULL ) {
- perror( s );
- 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 );
LDAPMessage *lm;
ber_int_t errcode = LDAP_SUCCESS;
- int rc;
ber_tag_t tag;
BerElement *ber;
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ENTRY, "ldap_parse_result\n", 0,0,0 );
+#else
Debug( LDAP_DEBUG_TRACE, "ldap_parse_result\n", 0, 0, 0 );
+#endif
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
assert( r != NULL );
- if ( ld == NULL || r == NULL ) {
- return LDAP_PARAM_ERROR;
- }
-
if(errcodep != NULL) *errcodep = LDAP_SUCCESS;
if(matcheddnp != NULL) *matcheddnp = NULL;
if(errmsgp != NULL) *errmsgp = 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;
}
}
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;
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;
projects / openldap / blobdiff