summaryrefslogtreecommitdiff
path: root/source3/namedbserver.c
diff options
context:
space:
mode:
Diffstat (limited to 'source3/namedbserver.c')
-rw-r--r--source3/namedbserver.c26
1 files changed, 11 insertions, 15 deletions
diff --git a/source3/namedbserver.c b/source3/namedbserver.c
index 7440b42494..c3f6076f49 100644
--- a/source3/namedbserver.c
+++ b/source3/namedbserver.c
@@ -58,24 +58,20 @@ void remove_old_servers(struct work_record *work, time_t t,
/* expire old entries in the serverlist */
for (s = work->serverlist; s; s = nexts)
{
- if (remove_all || (s->death_time && (t == -1 || s->death_time < t)))
- {
- DEBUG(3,("Removing dead server %s\n",s->serv.name));
- updatedlists = True;
- nexts = s->next;
+ nexts = s->next;
+ if (remove_all ||
+ (s->death_time && (t == -1 || s->death_time < t))) {
+ DEBUG(3,("Removing dead server %s\n",s->serv.name));
+ updatedlists = True;
- if (s->prev) s->prev->next = s->next;
- if (s->next) s->next->prev = s->prev;
+ if (s->prev) s->prev->next = s->next;
+ if (s->next) s->next->prev = s->prev;
- if (work->serverlist == s)
- work->serverlist = s->next;
+ if (work->serverlist == s)
+ work->serverlist = s->next;
- free(s);
- }
- else
- {
- nexts = s->next;
- }
+ free(s);
+ }
}
}