X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fdisptmpl.c;h=32c253d32dc0699290e10ba5c9e709f37cc84775;hb=ac8b5468aadcb26e9729c0c90e682e904774c7d3;hp=d9d768ef9b94412031d434ba68418b4d3e735e5c;hpb=716523f1ac707e62f61f1ad5a253a643612529e8;p=openldap

diff --git a/libraries/libldap/disptmpl.c b/libraries/libldap/disptmpl.c
index d9d768ef9b..32c253d32d 100644
--- a/libraries/libldap/disptmpl.c
+++ b/libraries/libldap/disptmpl.c
@@ -20,7 +20,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>
@@ -35,7 +36,7 @@
 #include "disptmpl.h"
 
 static void free_disptmpl LDAP_P(( struct ldap_disptmpl *tmpl ));
-static int read_next_tmpl LDAP_P(( char **bufp, long *blenp,
+static int read_next_tmpl LDAP_P(( char **bufp, ber_len_t *blenp,
 	struct ldap_disptmpl **tmplp, int dtversion ));
 
 static const char *const	tmploptions[] = {
@@ -138,7 +139,7 @@ ldap_init_templates( char *file, struct ldap_disptmpl **tmpllistp )
 
 
 int
-ldap_init_templates_buf( char *buf, long buflen,
+ldap_init_templates_buf( char *buf, ber_len_t buflen,
 	struct ldap_disptmpl **tmpllistp )
 {
     int				rc=-1, version;
@@ -388,7 +389,7 @@ ldap_tmplattrs( struct ldap_disptmpl *tmpl, char **includeattrs,
 	for ( i = 0; !memerr && includeattrs[ i ] != NULL; ++i ) {
 	    if (( attrs = (char **)LDAP_REALLOC( attrs, ( attrcnt + 2 ) *
 		    sizeof( char * ))) == NULL || ( attrs[ attrcnt++ ] =
-		    strdup( includeattrs[ i ] )) == NULL ) {
+		    LDAP_STRDUP( includeattrs[ i ] )) == NULL ) {
 		memerr = 1;
 	    } else {
 		attrs[ attrcnt ] = NULL;
@@ -415,7 +416,7 @@ ldap_tmplattrs( struct ldap_disptmpl *tmpl, char **includeattrs,
 	    if ( ticolp->ti_attrname != NULL ) {
 		if (( attrs = (char **)LDAP_REALLOC( attrs, ( attrcnt + 2 ) *
 			sizeof( char * ))) == NULL || ( attrs[ attrcnt++ ] =
-			strdup( ticolp->ti_attrname )) == NULL ) {
+			LDAP_STRDUP( ticolp->ti_attrname )) == NULL ) {
 		    memerr = 1;
 		} else {
 		    attrs[ attrcnt ] = NULL;
@@ -440,7 +441,7 @@ ldap_tmplattrs( struct ldap_disptmpl *tmpl, char **includeattrs,
 
 
 static int
-read_next_tmpl( char **bufp, long *blenp, struct ldap_disptmpl **tmplp,
+read_next_tmpl( char **bufp, ber_len_t *blenp, struct ldap_disptmpl **tmplp,
 	int dtversion )
 {
     int				i, j, tokcnt, samerow, adsource;