mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-17 14:00:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update TLS and SASL error reporting

Browse Source
This commit is contained in:
Kurt Zeilenga 2000-10-11 04:29:12 +00:00
parent 48dd257230
commit c6ac8ab9a5
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,6 +1,8 @@
OpenLDAP 2.0 Change Log
OpenLDAP 2.0.X Engineering
Updated -lldap SASL error reporting
Updated -lldap TLS error reporting
Build Environment
Fixed $(DESTDIR) install (ITS#806)

12
libraries/libldap/cyrus.c
View File

@ -403,7 +403,7 @@ ldap_int_sasl_open(
assert( lc->lconn_sasl_ctx == NULL );
if ( host == NULL ) {
ld->ld_errno = LDAP_UNAVAILABLE;
ld->ld_errno = LDAP_LOCAL_ERROR;
return ld->ld_errno;
}
@ -482,13 +482,15 @@ ldap_int_sasl_bind(
if ( sd == AC_SOCKET_INVALID ) {
/* not connected yet */
int rc = ldap_open_defconn( ld );
int rc;
rc = ldap_open_defconn( ld );
if( rc < 0 ) return ld->ld_errno;
ber_sockbuf_ctrl( ld->ld_sb, LBER_SB_OPT_GET_FD, &sd );
if( sd == AC_SOCKET_INVALID ) {
ld->ld_errno = LDAP_UNAVAILABLE;
ld->ld_errno = LDAP_LOCAL_ERROR;
return ld->ld_errno;
}
}
@ -496,7 +498,7 @@ ldap_int_sasl_bind(
ctx = ld->ld_defconn->lconn_sasl_ctx;
if( ctx == NULL ) {
ld->ld_errno = LDAP_UNAVAILABLE;
ld->ld_errno = LDAP_LOCAL_ERROR;
return ld->ld_errno;
}

7
libraries/libldap/sasl.c
View File

@ -366,24 +366,25 @@ ldap_pvt_sasl_getmechs ( LDAP *ld, char **pmechlist )
e = ldap_first_entry( ld, res );
if ( e == NULL ) {
ldap_msgfree( res );
if ( ld->ld_errno == LDAP_SUCCESS ) {
ld->ld_errno = LDAP_UNAVAILABLE;
ld->ld_errno = LDAP_NO_SUCH_OBJECT;
}
return ld->ld_errno;
}
values = ldap_get_values( ld, e, "supportedSASLMechanisms" );
if ( values == NULL ) {
ld->ld_errno = LDAP_NO_SUCH_ATTRIBUTE;
ldap_msgfree( res );
ld->ld_errno = LDAP_NO_SUCH_ATTRIBUTE;
return ld->ld_errno;
}
mechlist = ldap_charray2str( values, " " );
if ( mechlist == NULL ) {
ld->ld_errno = LDAP_NO_MEMORY;
LDAP_VFREE( values );
ldap_msgfree( res );
ld->ld_errno = LDAP_NO_MEMORY;
return ld->ld_errno;
}

4
libraries/libldap/tls.c
View File

@ -1010,7 +1010,7 @@ tls_seed_PRNG( const char *randfile )
if (randfile == NULL) {
Debug( LDAP_DEBUG_ANY,
"TLS: Use configuration file or $RANDFILE to define seed PRNG",
"TLS: Use configuration file or $RANDFILE to define seed PRNG\n",
0, 0, 0);
return -1;
}
@ -1019,7 +1019,7 @@ tls_seed_PRNG( const char *randfile )
if (RAND_status() == 0) {
Debug( LDAP_DEBUG_ANY,
"TLS: PRNG not been seeded with enough data",
"TLS: PRNG not been seeded with enough data\n",
0, 0, 0);
return -1;
}