wrepl_server: fix the record expire time of sgroup merges

if we're the owner, the expire time becomes the highest
expire time of owned addresses

metze
(from samba4wins tree 024f439db45046c7c0bb4759c75877462405baec)

diff --git a/source4/wrepl_server/wrepl_apply_records.c b/source4/wrepl_server/wrepl_apply_records.c
index 17777f4dcffc974d7e0fca083f3c03dac6560ccc..6db093b619fe7832d2a51ca05eda5df8fa5344c2 100644 (file)
--- a/source4/wrepl_server/wrepl_apply_records.c
+++ b/source4/wrepl_server/wrepl_apply_records.c
@@ -1283,7 +1283,25 @@ static NTSTATUS r_do_sgroup_merge(struct wreplsrv_partner *partner,
         * will be owner of the merge result, otherwise we take the ownership
         */
        if (become_owner) {
+               time_t lh = 0;
+
                modify_flags = WINSDB_FLAG_ALLOC_VERSION | WINSDB_FLAG_TAKE_OWNERSHIP;
+
+               /*
+                * if we're the owner, the expire time becomes the highest
+                * expire time of owned addresses
+                */
+               len = winsdb_addr_list_length(merge->addresses);
+
+               for (i=0; i < len; i++) {
+                       if (strcmp(merge->addresses[i]->wins_owner, local_owner)==0) {
+                               lh = MAX(lh, merge->addresses[i]->expire_time);
+                       }
+               }
+
+               if (lh != 0) {
+                       merge->expire_time = lh;
+               }
        }
 
        ret = winsdb_modify(partner->service->wins_db, merge, modify_flags);