summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-09-17 15:31:51 -0700
committerKarolin Seeger <kseeger@samba.org>2013-09-27 09:28:56 +0200
commit815867367d2c1a75aef236ff1d9f1169b22828dd (patch)
treea2b493703dde534be94eb33a2137e6056832c5f9
parent4ef85c7bd9b94f14c03f07f521b53a8d3a26528b (diff)
downloadsamba-815867367d2c1a75aef236ff1d9f1169b22828dd.tar.gz
dsdb-repl_meta_data: Check for a NULL invocationID and do not proceed
This can happen if we do not find the invocationID, with later patches. Andrew Bartlett Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit 40f99625ee4447aa36c0fa5631ffa13b7003569f)
-rw-r--r--source4/dsdb/samdb/ldb_modules/repl_meta_data.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index c8cdfecb93..7bd0265f9d 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -4839,6 +4839,10 @@ static int replmd_replicated_uptodate_modify(struct replmd_replicated_request *a
/* get our invocation_id if we have one already attached to the ldb */
our_invocation_id = samdb_ntds_invocation_id(ldb);
+ if (our_invocation_id == NULL) {
+ DEBUG(0, ("repl_meta_data: Could not find our own server's invocationID!\n"));
+ return replmd_replicated_request_werror(ar, WERR_DS_DRA_INTERNAL_ERROR);
+ }
/* merge in the source_dsa vector is available */
for (i=0; (ruv && i < ruv->count); i++) {