1 files changed, 11 insertions, 3 deletions
diff --git a/source/nmbd/nmbd_winsserver.c b/source/nmbd/nmbd_winsserver.c
index 48d27f7bae9..1502dd8155d 100644
--- a/source/nmbd/nmbd_winsserver.c
+++ b/source/nmbd/nmbd_winsserver.c
@@ -1524,9 +1524,11 @@ void initiate_wins_processing(time_t t)
 
   if (!lasttime)
     lasttime = t;
-  if (t - lasttime < 5)
+  if (t - lasttime < 20)
     return;
 
+  lasttime = t;
+
   if(!lp_we_are_a_wins_server())
     return;
 
@@ -1541,17 +1543,23 @@ void initiate_wins_processing(time_t t)
 /*******************************************************************
  Write out the current WINS database.
 ******************************************************************/
-
 void wins_write_database(void)
 {
   struct name_record *namerec;
   pstring fname, fnamenew;
-   
+  static int child_pid;
+
   FILE *fp;
    
   if(!lp_we_are_a_wins_server())
     return;
 
+  /* we will do the writing in a child process to ensure that the parent
+     doesn't block while this is done */
+  if ((child_pid=fork())) {
+	  return;
+  }
+
   pstrcpy(fname,lp_lockdir());
   trim_string(fname,NULL,"/");
   pstrcat(fname,"/");