mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#7168 cleanup prev commit

Browse Source
This commit is contained in:
Howard Chu 2012-06-25 12:45:32 -07:00
parent bb8112c382
commit 73b631b814
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
servers/slapd/overlays/constraint.c
View File

@ -181,7 +181,7 @@ constraint_cf_gen( ConfigArgs *c )
}
if (cp->count || cp->size) {
int len = snprintf(val_buf, sizeof(val_buf), "%d", val);
int len = snprintf(val_buf, sizeof(val_buf), "%zd", val);
if (len <= 0) {
/* error */
return -1;
@ -846,40 +846,29 @@ constraint_check_count_violation( Modifications *m, Entry *target_entry, constra
int j;
for ( j = 0; cp->ap[j]; j++ ) {
ca = 0;
/* Get this attribute count */
if ( target_entry )
ce = constraint_count_attr( target_entry, cp->ap[j] );
for( ; m; m = m->sml_next ) {
if ( cp->ap[j] == m->sml_desc ) {
ca = m->sml_numvals;
switch ( m->sml_op ) {
case LDAP_MOD_DELETE:
if (( b = m->sml_values ) == NULL || b[0].bv_val == NULL ) {
if ( !ca || ca > ce ) {
ce = 0;
}
else {
} else {
/* No need to check for values' validity. Invalid values
* cause the whole transaction to die anyway. */
for ( ca = 0; b[ca].bv_val; ++ca );
ce -= ca;
}
break;
case LDAP_MOD_ADD:
if (( b = m->sml_values ) == NULL || b[0].bv_val == NULL )
continue;
for ( ca = 0; b[ca].bv_val; ++ca );
ce += ca;
break;
case LDAP_MOD_REPLACE:
if (( b = m->sml_values ) == NULL || b[0].bv_val == NULL )
continue;
for ( ca = 0; b[ca].bv_val; ++ca );
ce = ca;
break;