Happy New Year!

[openldap] / libraries / libldap / error.c

diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c
index b0d5d3cda1234163ecd8b5be3274274067dc78b2..0246e5a1ef0038d815ba88264a0df8e5e8e0f6c6 100644 (file)
--- a/libraries/libldap/error.c
+++ b/libraries/libldap/error.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2010 The OpenLDAP Foundation.
+ * Copyright 1998-2016 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -150,6 +150,7 @@ ldap_err2string( int err )
        C(LDAP_MORE_RESULTS_TO_RETURN,  N_("More results to return"));
        C(LDAP_CLIENT_LOOP,                             N_("Client Loop"));
        C(LDAP_REFERRAL_LIMIT_EXCEEDED, N_("Referral Limit Exceeded"));
+       C(LDAP_X_CONNECTING,                    N_("Connecting (X)"));
 #      undef C
 
        default:
@@ -260,9 +261,7 @@ ldap_parse_result(
        if(referralsp != NULL) *referralsp = NULL;
        if(serverctrls != NULL) *serverctrls = NULL;
 
-#ifdef LDAP_R_COMPILE
-       ldap_pvt_thread_mutex_lock( &ld->ld_res_mutex );
-#endif
+       LDAP_MUTEX_LOCK( &ld->ld_res_mutex );
        /* Find the result, last msg in chain... */
        lm = r->lm_chain_tail;
        /* FIXME: either this is not possible (assert?)
@@ -282,9 +281,7 @@ ldap_parse_result(
 
        if( lm == NULL ) {
                errcode = ld->ld_errno = LDAP_NO_RESULTS_RETURNED;
-#ifdef LDAP_R_COMPILE
-               ldap_pvt_thread_mutex_unlock( &ld->ld_res_mutex );
-#endif
+               LDAP_MUTEX_UNLOCK( &ld->ld_res_mutex );
            goto done;
        }
 
@@ -390,10 +387,7 @@ ldap_parse_result(
                        *referralsp = ldap_value_dup( ld->ld_referrals );
                }
        }
-
-#ifdef LDAP_R_COMPILE
-       ldap_pvt_thread_mutex_unlock( &ld->ld_res_mutex );
-#endif
+       LDAP_MUTEX_UNLOCK( &ld->ld_res_mutex );
 
 done:
        if ( freeit ) {