4 files changed, 9 insertions, 9 deletions

diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c
index 7195380e..40155096 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c
@@ -304,7 +304,7 @@ ldbm_instance_attrcrypt_config_modify_callback(Slapi_PBlock *pb, Slapi_Entry *e,
 
         if (strcasecmp(config_attr, "nsEncryptionAlgorithm") == 0) {
 
-            if ((mods[i]->mod_op & ~LDAP_MOD_BVALUES) == LDAP_MOD_ADD) {
+            if (SLAPI_IS_MOD_ADD(mods[i]->mod_op)) {
 
                 for (j = 0; mods[i]->mod_bvalues[j] != NULL; j++) {
                     int cipher = ldbm_attrcrypt_parse_cipher(mods[i]->mod_bvalues[j]->bv_val);
@@ -315,7 +315,7 @@ ldbm_instance_attrcrypt_config_modify_callback(Slapi_PBlock *pb, Slapi_Entry *e,
                 }
                 continue;
             }
-            if ((mods[i]->mod_op & ~LDAP_MOD_BVALUES) == LDAP_MOD_DELETE) {
+            if (SLAPI_IS_MOD_DELETE(mods[i]->mod_op)) {
                 if ((mods[i]->mod_bvalues == NULL) ||
                     (mods[i]->mod_bvalues[0] == NULL)) {
 					/* Not legal */
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
index 57cf287c..bc6215a6 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
@@ -1727,8 +1727,8 @@ int ldbm_config_modify_entry_callback(Slapi_PBlock *pb, Slapi_Entry* entryBefore
                 continue;
             }
             
-            if ((mods[i]->mod_op & LDAP_MOD_DELETE) || 
-                ((mods[i]->mod_op & ~LDAP_MOD_BVALUES) == LDAP_MOD_ADD)) { 
+            if (SLAPI_IS_MOD_DELETE(mods[i]->mod_op) || 
+                SLAPI_IS_MOD_ADD(mods[i]->mod_op)) { 
                 rc= LDAP_UNWILLING_TO_PERFORM; 
                 PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "%s attributes is not allowed", 
                         (mods[i]->mod_op & LDAP_MOD_DELETE) ? "Deleting" : "Adding"); 
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_index_config.c b/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
index f86d7aa9..0b5db799 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
@@ -392,14 +392,14 @@ ldbm_instance_index_config_modify_callback(Slapi_PBlock *pb, Slapi_Entry *e,
         config_attr = (char *)mods[i]->mod_type;
 
         if (strcasecmp(config_attr, "nsIndexType") == 0) {
-            if ((mods[i]->mod_op & ~LDAP_MOD_BVALUES) == LDAP_MOD_ADD) {
+            if (SLAPI_IS_MOD_ADD(mods[i]->mod_op)) {
                 for (j = 0; mods[i]->mod_bvalues[j] != NULL; j++) {
                     charray_add(&addIndexTypesArray,
                         slapi_ch_strdup(mods[i]->mod_bvalues[j]->bv_val));
                 }
                 continue;
             }
-            if ((mods[i]->mod_op & ~LDAP_MOD_BVALUES) == LDAP_MOD_DELETE) {
+            if (SLAPI_IS_MOD_DELETE(mods[i]->mod_op)) {
                 if ((mods[i]->mod_bvalues == NULL) ||
                     (mods[i]->mod_bvalues[0] == NULL)) {
                     if (deleteIndexTypesArray) {
@@ -416,14 +416,14 @@ ldbm_instance_index_config_modify_callback(Slapi_PBlock *pb, Slapi_Entry *e,
             }
         }
         if (strcasecmp(config_attr, "nsMatchingRule") == 0) {
-            if ((mods[i]->mod_op & ~LDAP_MOD_BVALUES) == LDAP_MOD_ADD) {
+            if (SLAPI_IS_MOD_ADD(mods[i]->mod_op)) {
                 for (j = 0; mods[i]->mod_bvalues[j] != NULL; j++) {
                     charray_add(&addMatchingRulesArray,
                         slapi_ch_strdup(mods[i]->mod_bvalues[j]->bv_val));
                 }
                 continue;
             }
-            if ((mods[i]->mod_op & ~LDAP_MOD_BVALUES) == LDAP_MOD_DELETE) {
+            if (SLAPI_IS_MOD_DELETE(mods[i]->mod_op)) {
                 if ((mods[i]->mod_bvalues == NULL) ||
                     (mods[i]->mod_bvalues[0] == NULL)) {
                     if (deleteMatchingRulesArray) {
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
index e92ddc5a..c08dc405 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
@@ -977,7 +977,7 @@ moddn_rdn_add_needed (
     for (mod = slapi_mods_get_first_mod(smods_wsi);
 		 mod != NULL;
 		 mod = slapi_mods_get_next_mod(smods_wsi)) {
-		if (((mod->mod_op & ~LDAP_MOD_BVALUES) == LDAP_MOD_DELETE) && 
+		if (SLAPI_IS_MOD_DELETE(mod->mod_op) && 
 			(strcasecmp(mod->mod_type, type) == 0) &&
 			(mod->mod_bvalues != NULL) && 
 			(slapi_attr_value_cmp(attr, *mod->mod_bvalues, bvp) == 0)) {