summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2013-01-27 15:43:07 -0800
committerAndrew Bartlett <abartlet@samba.org>2013-05-23 20:26:22 +1000
commit640c2ff57518a5711e795e6cc9f48ae29d379a01 (patch)
treefa53a9ba84471dfda9d5509ea29f199b1eb1781c /source4
parentc7d4b87512eabbff5172716a755a3cd61fe5476b (diff)
downloadsamba-640c2ff57518a5711e795e6cc9f48ae29d379a01.tar.gz
samba-640c2ff57518a5711e795e6cc9f48ae29d379a01.tar.bz2
samba-640c2ff57518a5711e795e6cc9f48ae29d379a01.zip
dsdb-drs: when replicating schema object checks ask for removal of previous version if exists (bug #8680)
Signed-off-by: Matthieu Patou <mat@matws.net> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/repl/replicated_objects.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 29b494b816..6c96b4111e 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -133,9 +133,10 @@ WERROR dsdb_repl_make_working_schema(struct ldb_context *ldb,
* (OIDs as OID strings) into schema, using
* the remote prefixMap
*/
- werr = dsdb_schema_set_el_from_ldb_msg(ldb,
- working_schema,
- object.msg);
+ werr = dsdb_schema_set_el_from_ldb_msg_dups(ldb,
+ working_schema,
+ object.msg,
+ true);
if (!W_ERROR_IS_OK(werr)) {
DEBUG(4,("debug: failed to convert object %s into a schema element, will try during next loop: %s\n",
ldb_dn_get_linearized(object.msg->dn),