Howard convinced me that this version is slightly better.

back out previous commit.

diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c
index 316bbaa8ed1f5c4347b1d746c499bcfc0ef139af..379e673daf13a6a12ce5d026acdb85875873a594 100644 (file)
--- a/libraries/libldap/error.c
+++ b/libraries/libldap/error.c
@@ -160,6 +160,7 @@ ldap_perror( LDAP *ld, LDAP_CONST char *str )
        fflush( stderr );
 }
 
+/* deprecated */
 int
 ldap_result2error( LDAP *ld, LDAPMessage *r, int freeit )
 {
@@ -168,7 +169,7 @@ ldap_result2error( LDAP *ld, LDAPMessage *r, int freeit )
        rc = ldap_parse_result( ld, r, &err,
                NULL, NULL, NULL, NULL, freeit );
 
-       return rc != LDAP_SUCCESS ? rc : err;
+       return err != LDAP_SUCCESS ? err : rc;
 }
 
 /*