First version of TLS glue for SSLeay/OpenSSL originally written by

[openldap] / libraries / libldap / ufn.c

diff --git a/libraries/libldap/ufn.c b/libraries/libldap/ufn.c
index aad63aa341faff00a9b45a40c9d3494ea143dcdd..da95c7ba63a5b1c820206ccc56bd9594fd806d84 100644 (file)
--- a/libraries/libldap/ufn.c
+++ b/libraries/libldap/ufn.c
@@ -12,15 +12,16 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <ac/string.h>
-#include <ctype.h>
-#include <stdlib.h>
 
+#include <ac/stdlib.h>
+
+#include <ac/ctype.h>
 #include <ac/socket.h>
+#include <ac/string.h>
 #include <ac/time.h>
 
 #include "ldap-int.h"
-#include "ldapconfig.h"
+#include "ldap_defaults.h"
 
 typedef int (*cancelptype) LDAP_P(( void *cancelparm ));
 
@@ -125,11 +126,11 @@ ldap_ufn_search_ctx( LDAP *ld, char **ufncomp, int ncomp, char *prefix,
 
                if ( candidates == NULL ) {
                        if ( prefix != NULL ) {
-                               if ( (dns = (char **) malloc( sizeof(char *)
+                               if ( (dns = (char **) LDAP_MALLOC( sizeof(char *)
                                    * 2 )) == NULL ) {
                                        return( ld->ld_errno = LDAP_NO_MEMORY );
                                }
-                               dns[0] = strdup( prefix );
+                               dns[0] = LDAP_STRDUP( prefix );
                                dns[1] = NULL;
                        } else {
                                dns = NULL;
@@ -144,14 +145,14 @@ ldap_ufn_search_ctx( LDAP *ld, char **ufncomp, int ncomp, char *prefix,
                                        continue;
 
                                if ( dns == NULL ) {
-                                       if ( (dns = (char **) malloc(
+                                       if ( (dns = (char **) LDAP_MALLOC(
                                            sizeof(char *) * 8 )) == NULL ) {
                                                ld->ld_errno = LDAP_NO_MEMORY;
                                                return( LDAP_NO_MEMORY );
                                        }
                                        max = 8;
                                } else if ( i >= max ) {
-                                       if ( (dns = (char **) realloc( dns,
+                                       if ( (dns = (char **) LDAP_REALLOC( dns,
                                            sizeof(char *) * 2 * max ))
                                            == NULL )
                                        {
@@ -264,7 +265,7 @@ ldap_ufn_search_ct(
        }
        for ( pcomp = 0; prefixcomp[pcomp] != NULL; pcomp++ )
                ;       /* NULL */
-       if ( (pbuf = (char *) malloc( strlen( ld->ld_ufnprefix ) + 1 ))
+       if ( (pbuf = (char *) LDAP_MALLOC( strlen( ld->ld_ufnprefix ) + 1 ))
            == NULL ) { 
                ldap_value_free( ufncomp );
                ldap_value_free( prefixcomp );
@@ -293,7 +294,7 @@ ldap_ufn_search_ct(
 
        ldap_value_free( ufncomp );
        ldap_value_free( prefixcomp );
-       free( pbuf );
+       LDAP_FREE( pbuf );
 
        return( err );
 }
@@ -474,9 +475,9 @@ void
 ldap_ufn_setprefix( LDAP *ld, LDAP_CONST char *prefix )
 {
        if ( ld->ld_ufnprefix != NULL )
-               free( ld->ld_ufnprefix );
+               LDAP_FREE( ld->ld_ufnprefix );
 
-       ld->ld_ufnprefix = strdup( prefix );
+       ld->ld_ufnprefix = LDAP_STRDUP( prefix );
 }
 
 int