X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmods.c;h=f57cf41dab6deb5c6c49b767a8a651b8353f55a9;hb=a32f8c079addfe1cc4592e4c905bf72f69aba2ad;hp=203524666a12544afb03e8a4b1b4f603f2247833;hpb=8eaaa67db06e4dc16cac607b6e7e4decafd1bd81;p=openldap diff --git a/servers/slapd/mods.c b/servers/slapd/mods.c index 203524666a..f57cf41dab 100644 --- a/servers/slapd/mods.c +++ b/servers/slapd/mods.c @@ -69,7 +69,7 @@ modify_add_values( *text = textbuf; snprintf( textbuf, textlen, "modify/%s: %s: value #%i already exists", - op, mod->sm_desc->ad_cname.bv_val ); + op, mod->sm_desc->ad_cname.bv_val, j ); return LDAP_TYPE_OR_VALUE_EXISTS; } } @@ -85,7 +85,7 @@ modify_add_values( *text = textbuf; snprintf( textbuf, textlen, "modify/%s: %s: value #%i already exists", - op, mod->sm_desc->ad_cname.bv_val ); + op, mod->sm_desc->ad_cname.bv_val, j ); return LDAP_TYPE_OR_VALUE_EXISTS; } } @@ -155,8 +155,7 @@ modify_delete_values( { int i, j, k, found; Attribute *a; - char *desc = mod->sm_desc->ad_cname.bv_val; - MatchingRule *mr = mod->sm_desc->ad_type->sat_equality; + MatchingRule *mr = mod->sm_desc->ad_type->sat_equality; /* delete the entire attribute */ if ( mod->sm_bvalues == NULL ) { @@ -304,22 +303,3 @@ slap_mods_free( } } -void -slap_modlist_free( - LDAPModList *ml -) -{ - LDAPModList *next; - - for ( ; ml != NULL; ml = next ) { - next = ml->ml_next; - - if (ml->ml_type) - free( ml->ml_type ); - - if ( ml->ml_bvalues != NULL ) - ber_bvecfree( ml->ml_bvalues ); - - free( ml ); - } -}