summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-10-08 19:39:07 +0000
committerJeremy Allison <jra@samba.org>2001-10-08 19:39:07 +0000
commitf5a5acec33160e9eedad079afe04597f796658d3 (patch)
tree6d3dfa5b88f2a4f4d2ae021dc30569213fbfeba0
parentd02b5fefba169ad6cdcbbaf01769113481692f38 (diff)
downloadsamba-f5a5acec33160e9eedad079afe04597f796658d3.tar.gz
samba-f5a5acec33160e9eedad079afe04597f796658d3.tar.bz2
samba-f5a5acec33160e9eedad079afe04597f796658d3.zip
Fixed WINS re-registration bug. Don't ask..... :-(. It was in my code :-).
Jeremy. (This used to be commit 129c640810bdf9ce2942e682d3d6fcca01a13488)
-rw-r--r--source3/nmbd/nmbd_mynames.c4
-rw-r--r--source3/nmbd/nmbd_nameregister.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/nmbd/nmbd_mynames.c b/source3/nmbd/nmbd_mynames.c
index 47655c804b..7f9a3441a8 100644
--- a/source3/nmbd/nmbd_mynames.c
+++ b/source3/nmbd/nmbd_mynames.c
@@ -217,8 +217,8 @@ void refresh_my_names(time_t t)
*/
if( !is_refresh_already_queued( subrec, namerec) )
refresh_name( subrec, namerec, NULL, NULL, NULL );
- namerec->data.death_time += lp_max_ttl();
- namerec->data.refresh_time += MIN(lp_max_ttl(), MAX_REFRESH_TIME);
+ namerec->data.death_time = t + lp_max_ttl();
+ namerec->data.refresh_time = t + MIN(lp_max_ttl(), MAX_REFRESH_TIME);
}
}
}
diff --git a/source3/nmbd/nmbd_nameregister.c b/source3/nmbd/nmbd_nameregister.c
index 24463e1f9b..c3361cec60 100644
--- a/source3/nmbd/nmbd_nameregister.c
+++ b/source3/nmbd/nmbd_nameregister.c
@@ -209,6 +209,7 @@ responding.\n", inet_ntoa(rrec->packet->ip)));
if(rrec->repeat_interval > (5 * 60))
rrec->repeat_interval = (5 * 60);
rrec->repeat_time = time(NULL) + rrec->repeat_interval;
+ rrec->in_expiration_processing = False;
DEBUG(5,("register_name_timeout_response: increasing WINS timeout to %d seconds.\n",
(int)rrec->repeat_interval));