From 404a8c2c7e956ac1618512f8d69fce541d269308 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 12 Mar 2003 21:58:48 +0000 Subject: [PATCH] sync with head --- servers/slapd/daemon.c | 6 +++--- servers/slapd/filter.c | 32 ++++++++++++++++---------------- servers/slapd/modify.c | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c index 5869fe418c..e61feceb12 100644 --- a/servers/slapd/daemon.c +++ b/servers/slapd/daemon.c @@ -107,7 +107,7 @@ void slapd_slp_init( const char* urls ) { if( strcmp( slapd_srvurls[i], "ldap:///" ) == 0) { char *host = ldap_pvt_get_fqdn( NULL ); if ( host != NULL ) { - slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i], + slapd_srvurls[i] = (char *) ch_realloc( slapd_srvurls[i], strlen( host ) + sizeof( LDAP_SRVTYPE_PREFIX ) ); strcpy( lutil_strcopy(slapd_srvurls[i], @@ -119,7 +119,7 @@ void slapd_slp_init( const char* urls ) { } else if ( strcmp( slapd_srvurls[i], "ldaps:///" ) == 0) { char *host = ldap_pvt_get_fqdn( NULL ); if ( host != NULL ) { - slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i], + slapd_srvurls[i] = (char *) ch_realloc( slapd_srvurls[i], strlen( host ) + sizeof( LDAPS_SRVTYPE_PREFIX ) ); strcpy( lutil_strcopy(slapd_srvurls[i], @@ -1613,7 +1613,7 @@ slapd_daemon_task( #ifdef SLAPD_RLOOKUPS if ( use_reverse_lookup ) { char *herr; - if (ldap_pvt_get_hname( &from, len, hbuf, + if (ldap_pvt_get_hname( (const struct sockaddr *)&from, len, hbuf, sizeof(hbuf), &herr ) == 0) { ldap_pvt_str2lower( hbuf ); dnsname = hbuf; diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c index 45a8d190e9..c29b86f2ac 100644 --- a/servers/slapd/filter.c +++ b/servers/slapd/filter.c @@ -602,7 +602,7 @@ filter2bv( Filter *f, struct berval *fstr ) fstr->bv_len = f->f_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)", f->f_av_desc->ad_cname.bv_val, @@ -616,7 +616,7 @@ filter2bv( Filter *f, struct berval *fstr ) fstr->bv_len = f->f_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(>=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)", f->f_av_desc->ad_cname.bv_val, @@ -630,7 +630,7 @@ filter2bv( Filter *f, struct berval *fstr ) fstr->bv_len = f->f_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(<=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)", f->f_av_desc->ad_cname.bv_val, @@ -644,7 +644,7 @@ filter2bv( Filter *f, struct berval *fstr ) fstr->bv_len = f->f_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(~=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)", f->f_av_desc->ad_cname.bv_val, @@ -655,7 +655,7 @@ filter2bv( Filter *f, struct berval *fstr ) case LDAP_FILTER_SUBSTRINGS: fstr->bv_len = f->f_sub_desc->ad_cname.bv_len + ( sizeof("(=*)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 128 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 128 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)", f->f_sub_desc->ad_cname.bv_val ); @@ -710,7 +710,7 @@ filter2bv( Filter *f, struct berval *fstr ) case LDAP_FILTER_PRESENT: fstr->bv_len = f->f_desc->ad_cname.bv_len + ( sizeof("(=*)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)", f->f_desc->ad_cname.bv_val ); @@ -720,7 +720,7 @@ filter2bv( Filter *f, struct berval *fstr ) case LDAP_FILTER_OR: case LDAP_FILTER_NOT: fstr->bv_len = sizeof("(%)") - 1; - fstr->bv_val = malloc( fstr->bv_len + 128 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 128 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%c)", f->f_choice == LDAP_FILTER_AND ? '&' : @@ -757,7 +757,7 @@ filter2bv( Filter *f, struct berval *fstr ) ( f->f_mr_dnattrs ? sizeof(":dn")-1 : 0 ) + ( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len+1 : 0 ) + tmp.bv_len + ( sizeof("(:=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)", ad.bv_val, @@ -1141,7 +1141,7 @@ vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr ) } fstr->bv_len = sizeof("()") - 1; - fstr->bv_val = malloc( fstr->bv_len + 128 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 128 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "()"); @@ -1177,7 +1177,7 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr ) fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)", vrf->vrf_av_desc->ad_cname.bv_val, @@ -1191,7 +1191,7 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr ) fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(>=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)", vrf->vrf_av_desc->ad_cname.bv_val, @@ -1205,7 +1205,7 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr ) fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(<=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)", vrf->vrf_av_desc->ad_cname.bv_val, @@ -1219,7 +1219,7 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr ) fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(~=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)", vrf->vrf_av_desc->ad_cname.bv_val, @@ -1230,7 +1230,7 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr ) case LDAP_FILTER_SUBSTRINGS: fstr->bv_len = vrf->vrf_sub_desc->ad_cname.bv_len + ( sizeof("(=*)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 128 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 128 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)", vrf->vrf_sub_desc->ad_cname.bv_val ); @@ -1286,7 +1286,7 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr ) case LDAP_FILTER_PRESENT: fstr->bv_len = vrf->vrf_desc->ad_cname.bv_len + ( sizeof("(=*)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)", vrf->vrf_desc->ad_cname.bv_val ); @@ -1307,7 +1307,7 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr ) ( vrf->vrf_mr_dnattrs ? sizeof(":dn")-1 : 0 ) + ( vrf->vrf_mr_rule_text.bv_len ? vrf->vrf_mr_rule_text.bv_len+1 : 0 ) + tmp.bv_len + ( sizeof("(:=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)", ad.bv_val, diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c index 5e6f5232d0..0a6eb40680 100644 --- a/servers/slapd/modify.c +++ b/servers/slapd/modify.c @@ -23,13 +23,13 @@ #include #include -#include "lutil.h" - #include "ldap_pvt.h" #include "slap.h" #ifdef LDAP_SLAPI #include "slapi.h" #endif +#include "lutil.h" + int do_modify( -- 2.39.5