Use getpassphrase() instead of getpass() if available.

[openldap] / libraries / libldap / getdxbyname.c

diff --git a/libraries/libldap/getdxbyname.c b/libraries/libldap/getdxbyname.c
index 4543e88e45a9d96ea1cae3946910d431a8faf616..0f5ba3c4578c1cfad9bd6c32f14a3bb10e69266f 100644 (file)
--- a/libraries/libldap/getdxbyname.c
+++ b/libraries/libldap/getdxbyname.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -43,6 +44,10 @@ ldap_getdxbyname( const char *domain )
 
     memset( buf, 0, sizeof( buf ));
 
+#ifdef LDAP_R_COMPILE
+    ldap_pvt_thread_mutex_lock(&ldap_int_resolv_mutex);
+#endif
+
     if (( rc = res_search( domain, C_IN, T_TXT, buf, sizeof( buf ))) < 0
                || ( dxs = decode_answer( buf, rc )) == NULL ) {
        /*
@@ -59,6 +64,10 @@ ldap_getdxbyname( const char *domain )
        }
     }
 
+#ifdef LDAP_R_COMPILE
+    ldap_pvt_thread_mutex_unlock(&ldap_int_resolv_mutex);
+#endif
+
     return( dxs );
 }
 
@@ -123,7 +132,7 @@ decode_answer( unsigned char *answer, ber_len_t len )
        rr_len = _getshort( p );
        p += INT16SZ;
        if ( class == C_IN && type == T_TXT ) {
-           int         i, n, pref, txt_len;
+           int         pref, txt_len;
            char        *q, *r;
 
            q = (char *)p;