Return LDAP_BAD_PARAM if res is not EXOP result.

[openldap] / libraries / libldap / error.c

diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c
index 93e586363dc8f3a31fbaf38ffc21e233f9db7dd6..41570b64777439757a0c98119504111091580d3f 100644 (file)
--- a/libraries/libldap/error.c
+++ b/libraries/libldap/error.c
@@ -120,15 +120,15 @@ ldap_err2string( int err )
 void
 ldap_perror( LDAP *ld, LDAP_CONST char *str )
 {
-       char *s;
+       const char *s;
        struct ldaperror *e;
        Debug( LDAP_DEBUG_TRACE, "ldap_perror\n", 0, 0, 0 );
 
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
-       assert( s );
+       assert( str );
 
-       s = ( str != NULL ) ? (char *) str : "ldap_perror";
+       s = ( str != NULL ) ? str : "ldap_perror";
 
        if ( ld == NULL ) {
                perror( s );
@@ -163,8 +163,8 @@ ldap_result2error( LDAP *ld, LDAPMessage *r, int freeit )
 {
        LDAPMessage     *lm;
        BerElement      ber;
-       long            along;
-       unsigned long   rc;
+       ber_int_t       along;
+       ber_tag_t       rc;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_result2error\n", 0, 0, 0 );
 
@@ -172,7 +172,7 @@ ldap_result2error( LDAP *ld, LDAPMessage *r, int freeit )
        assert( LDAP_VALID( ld ) );
        assert( r != NULL );
 
-       if ( ld == NULL || r == NULLMSG )
+       if ( ld == NULL || r == NULL )
                return( LDAP_PARAM_ERROR );
 
        for ( lm = r; lm->lm_chain != NULL; lm = lm->lm_chain )