From 91e7c4160aed768251271ca261df961dd745d2a6 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 30 Apr 2015 12:05:17 -0700 Subject: [PATCH] s3: nmbd: Ensure we only set work_changed = true if we modify the record. https://bugzilla.samba.org/show_bug.cgi?id=11254 Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider (cherry picked from commit db6572ef80e20b0e577b9e9fb5d233f8bdd20713) --- source3/nmbd/nmbd_incomingdgrams.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/source3/nmbd/nmbd_incomingdgrams.c b/source3/nmbd/nmbd_incomingdgrams.c index 153a86db555..2dc684e5051 100644 --- a/source3/nmbd/nmbd_incomingdgrams.c +++ b/source3/nmbd/nmbd_incomingdgrams.c @@ -336,12 +336,25 @@ a local master browser for workgroup %s and we think we are master. Forcing elec ttl, comment); } else { /* Update the record. */ - servrec->serv.type = servertype|SV_TYPE_LOCAL_LIST_ONLY; + if (servrec->serv.type != + (servertype|SV_TYPE_LOCAL_LIST_ONLY)) { + servrec->serv.type = + servertype|SV_TYPE_LOCAL_LIST_ONLY; + subrec->work_changed = true; + } + if (!strequal(servrec->serv.comment,comment)) { + strlcpy(servrec->serv.comment, + comment, + sizeof(servrec->serv.comment)); + subrec->work_changed = true; + } update_server_ttl(servrec, ttl); - strlcpy(servrec->serv.comment,comment,sizeof(servrec->serv.comment)); } - - set_workgroup_local_master_browser_name( work, server_name ); + + if (!strequal(work->local_master_browser_name, server_name)) { + set_workgroup_local_master_browser_name( work, server_name ); + subrec->work_changed = true; + } } else { /* * This server is announcing it is going down. Remove it from the @@ -353,7 +366,6 @@ a local master browser for workgroup %s and we think we are master. Forcing elec } } - subrec->work_changed = True; done: END_PROFILE(local_master_announce); -- 2.11.4.GIT