+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
#include "portable.h"
#include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
#include <ac/socket.h>
#include <ac/string.h>
+#include <ac/time.h>
-#include "lber.h"
-#include "ldap.h"
+#include "ldap-int.h"
struct ldaperror {
int e_code;
char *e_reason;
};
-static struct ldaperror ldap_errlist[] = {
+static const struct ldaperror ldap_errlist[] = {
{LDAP_SUCCESS, "Success" },
{LDAP_OPERATIONS_ERROR, "Operations error" },
{LDAP_PROTOCOL_ERROR, "Protocol error" },
- {LDAP_TIMELIMIT_EXCEEDED, "Timelimit exceeded" },
- {LDAP_SIZELIMIT_EXCEEDED, "Sizelimit exceeded" },
+ {LDAP_TIMELIMIT_EXCEEDED, "Time limit exceeded" },
+ {LDAP_SIZELIMIT_EXCEEDED, "Size limit exceeded" },
{LDAP_COMPARE_FALSE, "Compare false" },
{LDAP_COMPARE_TRUE, "Compare true" },
{LDAP_STRONG_AUTH_NOT_SUPPORTED, "Strong authentication not supported" },
{LDAP_STRONG_AUTH_REQUIRED, "Strong authentication required" },
{LDAP_PARTIAL_RESULTS, "Partial results and referral received" },
+
+ {LDAP_REFERRAL, "Referral"},
+ {LDAP_ADMINLIMIT_EXCEEDED, "Administrative limit exceeded"},
+ {LDAP_UNAVAILABLE_CRITICIAL_EXTENSION,
+ "Criticial extension is unavailable"},
+ {LDAP_CONFIDENTIALITY_REQUIRED, "Confidentiality required"},
+ {LDAP_SASL_BIND_IN_PROGRESS, "SASL bind in progress"},
+
{LDAP_NO_SUCH_ATTRIBUTE, "No such attribute" },
{LDAP_UNDEFINED_TYPE, "Undefined attribute type" },
{LDAP_INAPPROPRIATE_MATCHING, "Inappropriate matching" },
{LDAP_CONSTRAINT_VIOLATION, "Constraint violation" },
{LDAP_TYPE_OR_VALUE_EXISTS, "Type or value exists" },
{LDAP_INVALID_SYNTAX, "Invalid syntax" },
+
{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_ALIAS_DEREF_PROBLEM, "Alias dereferencing problem" },
+
{LDAP_INAPPROPRIATE_AUTH, "Inappropriate authentication" },
{LDAP_INVALID_CREDENTIALS, "Invalid credentials" },
{LDAP_INSUFFICIENT_ACCESS, "Insufficient access" },
{LDAP_UNAVAILABLE, "DSA is unavailable" },
{LDAP_UNWILLING_TO_PERFORM, "DSA 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_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_SERVER_DOWN, "Can't contact LDAP server" },
{LDAP_LOCAL_ERROR, "Local error" },
{LDAP_USER_CANCELLED, "User cancelled operation" },
{LDAP_PARAM_ERROR, "Bad parameter to an ldap routine" },
{LDAP_NO_MEMORY, "Out of memory" },
+
+ {LDAP_CONNECT_ERROR, "Connect error" },
+ {LDAP_NOT_SUPPORTED, "Not Supported" },
+ {LDAP_CONTROL_NOT_FOUND, "Control not found" },
+ {LDAP_NO_RESULTS_RETURNED, "No results returned" },
+ {LDAP_MORE_RESULTS_TO_RETURN, "More results to return" },
+ {LDAP_CLIENT_LOOP, "Client Loop" },
+ {LDAP_REFERRAL_LIMIT_EXCEEDED, "Referral Limit Exceeded" },
+
{-1, 0 }
};
-char *
-ldap_err2string( int err )
+static struct ldaperror *ldap_int_error( int err )
{
int i;
- Debug( LDAP_DEBUG_TRACE, "ldap_err2string\n", 0, 0, 0 );
-
for ( i = 0; ldap_errlist[i].e_code != -1; i++ ) {
if ( err == ldap_errlist[i].e_code )
- return( ldap_errlist[i].e_reason );
+ return (struct ldaperror *) &ldap_errlist[i];
}
- return( "Unknown error" );
+ return NULL;
}
-#ifndef NO_USERINTERFACE
-void
-ldap_perror( LDAP *ld, char *s )
+char *
+ldap_err2string( int err )
{
- int i;
+ 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";
+}
+
+/* deprecated */
+void
+ldap_perror( LDAP *ld, LDAP_CONST char *str )
+{
+ const char *s;
+ 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 );
return;
}
- for ( i = 0; ldap_errlist[i].e_code != -1; i++ ) {
- if ( ld->ld_errno == ldap_errlist[i].e_code ) {
- fprintf( stderr, "%s: %s\n", s,
- ldap_errlist[i].e_reason );
- if ( ld->ld_matched != NULL && *ld->ld_matched != '\0' )
- fprintf( stderr, "%s: matched: %s\n", s,
- ld->ld_matched );
- if ( ld->ld_error != NULL && *ld->ld_error != '\0' )
- fprintf( stderr, "%s: additional info: %s\n",
- s, ld->ld_error );
- fflush( stderr );
- 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: Not an LDAP errno %d\n", s, ld->ld_errno );
- fflush( stderr );
-}
+ if ( ld->ld_matched != NULL ) {
+ fprintf( stderr, "\tmatched: \"%s\"\n",
+ ld->ld_matched );
+ }
-#else
+ if ( ld->ld_error != NULL ) {
+ fprintf( stderr, "\tadditional info: %s\n",
+ ld->ld_error );
+ }
-void
-ldap_perror( LDAP *ld, char *s )
-{
+ fflush( stderr );
}
-#endif /* NO_USERINTERFACE */
-
-
int
ldap_result2error( LDAP *ld, LDAPMessage *r, int freeit )
{
LDAPMessage *lm;
BerElement ber;
- long along;
- int rc;
+ ber_int_t along;
+ ber_tag_t rc;
Debug( LDAP_DEBUG_TRACE, "ldap_result2error\n", 0, 0, 0 );
- if ( r == NULLMSG )
+ assert( ld != NULL );
+ assert( LDAP_VALID( ld ) );
+ assert( r != NULL );
+
+ if ( ld == NULL || r == NULL )
return( LDAP_PARAM_ERROR );
for ( lm = r; lm->lm_chain != NULL; lm = lm->lm_chain )
; /* NULL */
if ( ld->ld_error ) {
- free( ld->ld_error );
+ LDAP_FREE( ld->ld_error );
ld->ld_error = NULL;
}
if ( ld->ld_matched ) {
- free( ld->ld_matched );
+ LDAP_FREE( ld->ld_matched );
ld->ld_matched = NULL;
}
ber = *(lm->lm_ber);
- if ( ld->ld_version == LDAP_VERSION2 ) {
+
+ if ( ld->ld_version < LDAP_VERSION2 ) {
+ rc = ber_scanf( &ber, "{ia}", &along, &ld->ld_error );
+ } else {
rc = ber_scanf( &ber, "{iaa}", &along, &ld->ld_matched,
&ld->ld_error );
- } else {
- rc = ber_scanf( &ber, "{ia}", &along, &ld->ld_error );
}
+
if ( rc == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR;
} else {
projects / openldap / blobdiff