From: Jeremy Allison <jra@samba.org> 
Date: Mon, 8 Oct 2001 19:39:07 +0000 (+0000)
Subject: Fixed WINS re-registration bug. Don't ask..... :-(. It was in my code :-).
X-Git-Tag: samba-2.2.5pre1~1315^2~78
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=129c640810bdf9ce2942e682d3d6fcca01a13488;p=bbaumbach%2Fsamba-autobuild%2F.git

Fixed WINS re-registration bug. Don't ask..... :-(. It was in my code :-).
Jeremy.
---

diff --git a/source/nmbd/nmbd_mynames.c b/source/nmbd/nmbd_mynames.c
index 47655c804bb..7f9a3441a8c 100644
--- a/source/nmbd/nmbd_mynames.c
+++ b/source/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/source/nmbd/nmbd_nameregister.c b/source/nmbd/nmbd_nameregister.c
index 24463e1f9b5..c3361cec60b 100644
--- a/source/nmbd/nmbd_nameregister.c
+++ b/source/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));