summaryrefslogtreecommitdiffstats
path: root/ldap/servers/slapd/schema.c
diff options
context:
space:
mode:
authorNathan Kinder <nkinder@redhat.com>2008-11-13 23:08:19 +0000
committerNathan Kinder <nkinder@redhat.com>2008-11-13 23:08:19 +0000
commit65e8b7e984129d767f6d766734e5bc1b9cac4ae0 (patch)
treeec16f39b0cfe4ec14f101f16540a36c20cbe6346 /ldap/servers/slapd/schema.c
parent4ac6f61a5098060c6ec40435b8258e8eb9f3da03 (diff)
downloadds-65e8b7e984129d767f6d766734e5bc1b9cac4ae0.tar.gz
ds-65e8b7e984129d767f6d766734e5bc1b9cac4ae0.tar.xz
ds-65e8b7e984129d767f6d766734e5bc1b9cac4ae0.zip
Resolves: 470918
Summary: Made replica_set_updatedn detect value add modify operations properly.
Diffstat (limited to 'ldap/servers/slapd/schema.c')
-rw-r--r--ldap/servers/slapd/schema.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ldap/servers/slapd/schema.c b/ldap/servers/slapd/schema.c
index c96a1efd..5613efb3 100644
--- a/ldap/servers/slapd/schema.c
+++ b/ldap/servers/slapd/schema.c
@@ -1681,7 +1681,7 @@ modify_schema_dse (Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry *entr
/*
* Delete an objectclass or attribute
*/
- if ( (mods[i]->mod_op & ~LDAP_MOD_BVALUES) == LDAP_MOD_DELETE) {
+ if (SLAPI_IS_MOD_DELETE(mods[i]->mod_op)) {
if (strcasecmp (mods[i]->mod_type, "objectclasses") == 0) {
*returncode = schema_delete_objectclasses (entryBefore, mods[i],
returntext, SLAPI_DSE_RETURNTEXT_SIZE, schema_ds4x_compat );
@@ -1707,7 +1707,7 @@ modify_schema_dse (Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry *entr
/*
* Replace an objectclass,attribute, or schema CSN
*/
- else if ( (mods[i]->mod_op & ~LDAP_MOD_BVALUES) == LDAP_MOD_REPLACE) {
+ else if (SLAPI_IS_MOD_REPLACE(mods[i]->mod_op)) {
int replace_allowed = 0;
slapdFrontendConfig_t *slapdFrontendConfig;
@@ -1777,7 +1777,7 @@ modify_schema_dse (Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry *entr
/*
* Add an objectclass or attribute
*/
- else if ( (mods[i]->mod_op & ~LDAP_MOD_BVALUES) == LDAP_MOD_ADD) {
+ else if (SLAPI_IS_MOD_ADD(mods[i]->mod_op)) {
if (strcasecmp (mods[i]->mod_type, "attributetypes") == 0) {
/*
* Add a new attribute