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 c31d926374b09d9dea095cdb43e01f92cd2d7691..0f5ba3c4578c1cfad9bd6c32f14a3bb10e69266f 100644 (file)
--- a/libraries/libldap/getdxbyname.c
+++ b/libraries/libldap/getdxbyname.c
@@ -1,4 +1,9 @@
+/* $OpenLDAP$ */
 /*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/*  Portions
  *  Copyright (c) 1995 Regents of the University of Michigan.
  *  All rights reserved.
  *
@@ -10,7 +15,7 @@
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>
@@ -19,7 +24,7 @@
 
 #include "ldap-int.h"
 
-static char ** decode_answer LDAP_P(( unsigned char *answer, int len ));
+static char ** decode_answer LDAP_P(( unsigned char *answer, ber_len_t len ));
 
 #define MAX_TO_SORT    32
 
@@ -29,7 +34,7 @@ static char ** decode_answer LDAP_P(( unsigned char *answer, int len ));
  *     array.
  */
 char **
-ldap_getdxbyname( char *domain )
+ldap_getdxbyname( const char *domain )
 {
     unsigned char      buf[ PACKETSZ ];
     char               **dxs;
@@ -39,15 +44,19 @@ ldap_getdxbyname( 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 ) {
        /*
         * punt:  return list conisting of the original domain name only
         */
-       if (( dxs = (char **)malloc( 2 * sizeof( char * ))) == NULL ||
-               ( dxs[ 0 ] = ldap_strdup( domain )) == NULL ) {
+       if (( dxs = (char **)LDAP_MALLOC( 2 * sizeof( char * ))) == NULL ||
+               ( dxs[ 0 ] = LDAP_STRDUP( domain )) == NULL ) {
            if ( dxs != NULL ) {
-               free( dxs );
+               LDAP_FREE( dxs );
            }
            dxs = NULL;
        } else {
@@ -55,12 +64,16 @@ ldap_getdxbyname( char *domain )
        }
     }
 
+#ifdef LDAP_R_COMPILE
+    ldap_pvt_thread_mutex_unlock(&ldap_int_resolv_mutex);
+#endif
+
     return( dxs );
 }
 
 
 static char **
-decode_answer( unsigned char *answer, int len )
+decode_answer( unsigned char *answer, ber_len_t len )
 {
     HEADER             *hp;
     char               buf[ 256 ], **dxs;
@@ -119,7 +132,7 @@ decode_answer( unsigned char *answer, int 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;
@@ -127,12 +140,12 @@ decode_answer( unsigned char *answer, int len )
                if ( *q >= 3 && strncasecmp( q + 1, "dx:", 3 ) == 0 ) {
                    txt_len = *q - 3;
                    r = q + 4;
-                   while ( isspace( *r )) { 
+                   while ( isspace( (unsigned char) *r )) { 
                        ++r;
                        --txt_len;
                    }
                    pref = 0;
-                   while ( isdigit( *r )) {
+                   while ( isdigit( (unsigned char) *r )) {
                        pref *= 10;
                        pref += ( *r - '0' );
                        ++r;
@@ -141,18 +154,14 @@ decode_answer( unsigned char *answer, int len )
                    if ( dx_count < MAX_TO_SORT - 1 ) {
                        dx_pref[ dx_count ] = pref;
                    }
-                   while ( isspace( *r )) { 
+                   while ( isspace( (unsigned char) *r )) { 
                        ++r;
                        --txt_len;
                    }
-                   if ( dx_count == 0 ) {
-                       dxs = (char **)malloc( 2 * sizeof( char * ));
-                   } else {
-                       dxs = (char **)realloc( dxs,
+                       dxs = (char **)LDAP_REALLOC( dxs,
                                ( dx_count + 2 ) * sizeof( char * ));
-                   }
                    if ( dxs == NULL || ( dxs[ dx_count ] =
-                               (char *)calloc( 1, txt_len + 1 )) == NULL ) {
+                               (char *)LDAP_CALLOC( 1, txt_len + 1 )) == NULL ) {
                        err = NO_RECOVERY;
                        continue;
                    }