diff options
| -rw-r--r-- | source4/rpc_server/drsuapi/getncchanges.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c index da294a6623a..a2063aaac8f 100644 --- a/source4/rpc_server/drsuapi/getncchanges.c +++ b/source4/rpc_server/drsuapi/getncchanges.c @@ -2578,8 +2578,13 @@ allowed: W_ERROR_HAVE_NO_MEMORY(msg_dn); - /* by re-searching here we avoid having a lot of full - * records in memory between calls to getncchanges + /* + * by re-searching here we avoid having a lot of full + * records in memory between calls to getncchanges. + * + * We expect that we may get some objects that vanish + * (tombstone expunge) between the first and second + * check. */ ret = drsuapi_search_with_extended_dn(sam_ctx, obj, &msg_res, msg_dn, @@ -2593,6 +2598,16 @@ allowed: continue; } + if (msg_res->count == 0) { + DEBUG(1,("getncchanges: got LDB_SUCCESS but failed" + "to get any results in fetch of DN " + "%s (race with tombstone expunge?)\n", + ldb_dn_get_extended_linearized(obj, + msg_dn, 1))); + talloc_free(obj); + continue; + } + msg = msg_res->msgs[0]; /* |