From 0f28c96d88cd9762e335d49b2ebf7d0ebdcbca48 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 25 May 2016 12:41:35 +1200 Subject: [PATCH] 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 Reviewed-by: Garming Sam --- source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 85939c2d742..4a927f02d29 100644 --- 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: -- 2.11.4.GIT