From ed43bfdd130631751541a9ff3e414029c454ac9d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 1 May 2015 09:56:59 -0700 Subject: [PATCH] s3: nmbd: Don't set work_changed = True inside update_server_ttl(). This is taken care of inside expire_servers() when it calls remove_server_from_workgroup(). Ensure the only functions in nmbd_serverlistdb.c that set subnet->work_changed are: remove_all_servers() add_server_to_workgroup() remove_server_from_workgroup() Fix inspired by a change from Volker. Signed-off-by: Jeremy Allison --- source3/nmbd/nmbd_serverlistdb.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/source3/nmbd/nmbd_serverlistdb.c b/source3/nmbd/nmbd_serverlistdb.c index b405719..cd84bdf 100644 --- a/source3/nmbd/nmbd_serverlistdb.c +++ b/source3/nmbd/nmbd_serverlistdb.c @@ -133,8 +133,6 @@ workgroup %s. This is a bug.\n", name, work->work_group)); DEBUG(3,("create_server_on_workgroup: Created server entry %s of type %x (%s) on \ workgroup %s.\n", name,servertype,comment, work->work_group)); - work->subnet->work_changed = True; - return(servrec); } @@ -151,8 +149,6 @@ void update_server_ttl(struct server_record *servrec, int ttl) servrec->death_time = PERMANENT_TTL; else servrec->death_time = (ttl != PERMANENT_TTL) ? time(NULL)+(ttl*3) : PERMANENT_TTL; - - servrec->subnet->work_changed = True; } /******************************************************************* @@ -172,7 +168,6 @@ void expire_servers(struct work_record *work, time_t t) if ((servrec->death_time != PERMANENT_TTL) && ((t == -1) || (servrec->death_time < t))) { DEBUG(3,("expire_old_servers: Removing timed out server %s\n",servrec->serv.name)); remove_server_from_workgroup(work, servrec); - work->subnet->work_changed = True; } } } -- 2.2.0.rc0.207.ga3a616c