X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Ferror.c;h=3540828821567c841de4bc8b620e9cdfeef51ff0;hb=959edd88c0dc0ad558d9ebc423996c7a9d0f8cbc;hp=5b771f9fad9b4a7c543a2d60fc6f091f3a039671;hpb=49f414738569096eae2c94a4f05f0f3f2636b8b7;p=openldap

diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c
index 5b771f9fad..3540828821 100644
--- a/libraries/libldap/error.c
+++ b/libraries/libldap/error.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -18,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" },
@@ -92,17 +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_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;
@@ -117,14 +150,13 @@ ldap_err2string( int err )
 
 	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;
 	Debug( LDAP_DEBUG_TRACE, "ldap_perror\n", 0, 0, 0 );
 
@@ -132,31 +164,24 @@ ldap_perror( LDAP *ld, LDAP_CONST char *str )
 	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 );
@@ -211,7 +236,6 @@ ldap_parse_result(
 	LDAPMessage	*lm;
 	ber_int_t errcode = LDAP_SUCCESS;
 
-	int rc;
 	ber_tag_t tag;
 	BerElement	*ber;
 
@@ -232,7 +256,7 @@ ldap_parse_result(
 	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 &&
@@ -307,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;