diff options
| author | Jeremy Allison <jra@samba.org> | 2015-05-01 09:56:59 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-05-04 18:24:21 +0200 |
| commit | c3c820a661c092de31d56c16c8cd1ec57999d2f7 (patch) | |
| tree | 9ed5df189905892c679d66231ade9bde29382a48 /source3/nmbd | |
| parent | db6572ef80e20b0e577b9e9fb5d233f8bdd20713 (diff) | |
| download | samba-c3c820a661c092de31d56c16c8cd1ec57999d2f7.tar.gz | |
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.
https://bugzilla.samba.org/show_bug.cgi?id=11254
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/nmbd')
| -rw-r--r-- | source3/nmbd/nmbd_serverlistdb.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source3/nmbd/nmbd_serverlistdb.c b/source3/nmbd/nmbd_serverlistdb.c index b4057193b2f..cd84bdf1d1e 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; } } } |