upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-19 02:28:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#3097 fix undefined objectclass assertion

Browse source
This commit is contained in:
Kurt Zeilenga 2004-04-19 20:15:14 +00:00
parent 001594d5ad
commit 3aa62fea17
6 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,8 +1,11 @@
OpenLDAP 2.2 Change Log
OpenLDAP 2.2.11 Engineering
Fixed slapd undefined objectclass bug (ITS#3097)
OpenLDAP 2.2.10 Release
Build Environment
Fix configure bug
Fix configure bug (ITS#3094)
OpenLDAP 2.2.9 Release
Fixed slapd syncrepl replication bugs (ITS#3055,3056,3069)

2
build/version.var
View file

@ -15,7 +15,7 @@
ol_package=OpenLDAP
ol_major=2
ol_minor=2
ol_patch=10
ol_patch=X
ol_api_inc=20210
ol_api_current=7
ol_api_revision=3

9
servers/slapd/add.c
View file

@ -501,7 +501,7 @@ slap_mods2entry(
}
} else {
int rc = LDAP_SUCCESS;
int rc;
int match;
for ( i = 1; mods->sml_values[i].bv_val != NULL; i++ ) {
@ -519,18 +519,19 @@ slap_mods2entry(
? &mods->sml_nvalues[j]
: &mods->sml_values[j],
text );
if ( rc == LDAP_SUCCESS && match == 0 ) {
/* value exists already */
snprintf( textbuf, textlen,
"%s: value #%d provided more than once",
mods->sml_desc->ad_cname.bv_val, j );
return LDAP_TYPE_OR_VALUE_EXISTS;
} else if ( rc != LDAP_SUCCESS ) {
return rc;
}
}
}
if ( rc != LDAP_SUCCESS ) {
return rc;
}
}
}

7
servers/slapd/modify.c
View file

@ -790,7 +790,7 @@ int slap_mods_check(
}
} else {
int rc = LDAP_SUCCESS;
int rc;
int match;
for ( i = 1; ml->sml_values[i].bv_val != NULL; i++ ) {
@ -815,11 +815,12 @@ int slap_mods_check(
ml->sml_desc->ad_cname.bv_val, j );
*text = textbuf;
return LDAP_TYPE_OR_VALUE_EXISTS;
} else if ( rc != LDAP_SUCCESS ) {
return rc;
}
}
}
if ( rc != LDAP_SUCCESS ) return rc;
}
}

3
servers/slapd/mods.c
View file

@ -110,6 +110,9 @@ modify_add_values(
"modify/%s: %s: value #%d already exists",
op, mod->sm_desc->ad_cname.bv_val, i );
return LDAP_TYPE_OR_VALUE_EXISTS;
} else if ( rc != LDAP_SUCCESS ) {
return rc;
}
}

4
servers/slapd/schema_prep.c
View file

@ -70,12 +70,12 @@ objectSubClassMatch(
}
/* desc form, return undefined */
return SLAPD_COMPARE_UNDEFINED;
return LDAP_INVALID_SYNTAX;
}
if ( oc == NULL ) {
/* unrecognized stored value */
return SLAPD_COMPARE_UNDEFINED;
return LDAP_INVALID_SYNTAX;
}
if( SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX( flags ) ) {