repl: Remove duplicated delete of sAMAccountType

This causes the version number in replPropertyMetaData to be
incorrectly bumped twice, because it is implied by not being in the
list of attributes to be preserved.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 85939c2d742a277837457cf553e2f4e11b26035f..4a927f02d29325a042112425898d0b045f557f70 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -3408,17 +3408,6 @@ static int replmd_delete_internals(struct ldb_module *module, struct ldb_request
                        }
                }
 
-               /* Duplicate with the below - we remove the
-                * samAccountType as an originating update, in case it
-                * somehow came back.  The objectCategory will have
-                * gone in the above */
-               ret = ldb_msg_add_empty(msg, "sAMAccountType", LDB_FLAG_MOD_REPLACE, NULL);
-               if (ret != LDB_SUCCESS) {
-                       talloc_free(tmp_ctx);
-                       ldb_module_oom(module);
-                       return ret;
-               }
-
                break;
 
        case OBJECT_DELETED: