s4-dsdb: fixed re-join of subdomain

if we repeat the join of a subdomain then we try to re-create the NC
for the subdomain during a DsAddEntry(). This allows that re-creation
to succeed if the NC already exists

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 106e261db978561874d586f30e00b7b36ade01f9..cae6bd45b3bcf0cd36aeb9ba4c97d98ae9d69169 100644 (file)
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -4495,9 +4495,10 @@ int dsdb_create_partial_replica_NC(struct ldb_context *ldb,  struct ldb_dn *dn)
        }
 
        ret = dsdb_add(ldb, msg, DSDB_MODIFY_PARTIAL_REPLICA);
-       if (ret != LDB_SUCCESS) {
-               DEBUG(0,("Failed to create new NC for %s - %s\n",
-                        ldb_dn_get_linearized(dn), ldb_errstring(ldb)));
+       if (ret != LDB_SUCCESS && ret != LDB_ERR_ENTRY_ALREADY_EXISTS) {
+               DEBUG(0,("Failed to create new NC for %s - %s (%s)\n",
+                        ldb_dn_get_linearized(dn),
+                        ldb_errstring(ldb), ldb_strerror(ret)));
                talloc_free(tmp_ctx);
                return ret;
        }