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 47655c804bb856d1529c4c7d8c1d1e247c563205..7f9a3441a8cf3bc00729c3ba01251a7fd8a5b671 100644 (file)
--- 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 24463e1f9b51da59ec75c93e9b8db757544852ed..c3361cec60b4f98751776c1ecdbc656089eefb17 100644 (file)
--- 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));