summaryrefslogtreecommitdiff
path: root/source4/rpc_server/drsuapi
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-01-02 16:51:30 +1100
committerAndrew Tridgell <tridge@samba.org>2010-01-02 17:28:35 +1100
commite809b721e9d1a750c3c1bf48882532714af69e5f (patch)
treeb26313ce3b03b4ac1786e69d71af0757abf2657d /source4/rpc_server/drsuapi
parent0bc902ac841ec883fb5a22b1db185d86ae12b114 (diff)
downloadsamba-e809b721e9d1a750c3c1bf48882532714af69e5f.tar.gz
samba-e809b721e9d1a750c3c1bf48882532714af69e5f.tar.bz2
samba-e809b721e9d1a750c3c1bf48882532714af69e5f.zip
s4-drs: don't give an error on repsTo delete if add is also specified
w2k8-r2 in dcpromo asks for a delete+add during its initial join.
Diffstat (limited to 'source4/rpc_server/drsuapi')
-rw-r--r--source4/rpc_server/drsuapi/updaterefs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/rpc_server/drsuapi/updaterefs.c b/source4/rpc_server/drsuapi/updaterefs.c
index 6e2efed4f9..b1e3d6c352 100644
--- a/source4/rpc_server/drsuapi/updaterefs.c
+++ b/source4/rpc_server/drsuapi/updaterefs.c
@@ -105,7 +105,9 @@ static WERROR uref_del_dest(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
return werr;
}
- if (!found && !(options & DRSUAPI_DS_REPLICA_UPDATE_GETCHG_CHECK)) {
+ if (!found &&
+ !(options & DRSUAPI_DS_REPLICA_UPDATE_GETCHG_CHECK) &&
+ !(options & DRSUAPI_DS_REPLICA_UPDATE_ADD_REFERENCE)) {
return WERR_DS_DRA_REF_NOT_FOUND;
}