From 81a2a43a5a3c13d08ed458d861d47f63a15ceac9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 25 Mar 2008 16:44:46 +0100 Subject: [PATCH] wrepl_scavenging: add a comment to make the is_static case more clear metze (from samba4wins tree 67fa7dc4fe36b143d36df1309840328a14683e31) --- source4/wrepl_server/wrepl_scavenging.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/source4/wrepl_server/wrepl_scavenging.c b/source4/wrepl_server/wrepl_scavenging.c index d4301e41c70..a1edd9e8ce3 100644 --- a/source4/wrepl_server/wrepl_scavenging.c +++ b/source4/wrepl_server/wrepl_scavenging.c @@ -99,12 +99,20 @@ static NTSTATUS wreplsrv_scavenging_owned_records(struct wreplsrv_service *servi switch (rec->state) { case WREPL_STATE_ACTIVE: old_state = "active"; - new_state = "active"; - if (!rec->is_static) { - new_state = "released"; - rec->state = WREPL_STATE_RELEASED; - rec->expire_time= service->config.tombstone_interval + now; + if (rec->is_static) { + /* + *we store it again, so that it won't appear + * in the scavenging the next time + */ + old_state = "active(static)"; + new_state = "active(static)"; + modify_flags = 0; + modify_record = true; + break; } + new_state = "released"; + rec->state = WREPL_STATE_RELEASED; + rec->expire_time= service->config.tombstone_interval + now; modify_flags = 0; modify_record = true; break; -- 2.34.1