Removed version number from file header.

[samba.git] / source / nmbd / nmbd_nameregister.c

diff --git a/source/nmbd/nmbd_nameregister.c b/source/nmbd/nmbd_nameregister.c
index 88057287372f2546c9dbe96213207cecae40280e..cbc72fe2a970bd36a7f254cbb4e6b987d3d292c2 100644 (file)
--- a/source/nmbd/nmbd_nameregister.c
+++ b/source/nmbd/nmbd_nameregister.c
@@ -1,6 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 1.9.
+   Unix SMB/CIFS implementation.
    NBT netbios routines and daemon - version 2
    Copyright (C) Andrew Tridgell 1994-1998
    Copyright (C) Luke Kenneth Casson Leighton 1994-1998
@@ -24,8 +23,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 extern fstring global_myworkgroup;
 
 /****************************************************************************
@@ -144,12 +141,12 @@ name %s on subnet %s.\n", inet_ntoa(p->ip), nmb_namestr(answer_name), subrec->su
        the success function. */
     standard_success_register(subrec, rrec->userdata, answer_name, nb_flags, ttl, registered_ip);
     if( rrec->success_fn)
-      (*rrec->success_fn)(subrec, rrec->userdata, answer_name, nb_flags, ttl, registered_ip);
+      (*(register_name_success_function)rrec->success_fn)(subrec, rrec->userdata, answer_name, nb_flags, ttl, registered_ip);
   }
   else
   {
     if( rrec->fail_fn)
-      (*rrec->fail_fn)(subrec, rrec, question_name);
+      (*(register_name_fail_function)rrec->fail_fn)(subrec, rrec, question_name);
     /* Remove the name. */
     standard_fail_register( subrec, rrec, question_name);
   }
@@ -211,6 +208,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));
@@ -226,12 +224,12 @@ responding.\n", inet_ntoa(rrec->packet->ip)));
        the success function. */
     standard_success_register(subrec, rrec->userdata, question_name, nb_flags, ttl, registered_ip);
     if( rrec->success_fn)
-      (*rrec->success_fn)(subrec, rrec->userdata, question_name, nb_flags, ttl, registered_ip);
+      (*(register_name_success_function)rrec->success_fn)(subrec, rrec->userdata, question_name, nb_flags, ttl, registered_ip);
   }
   else
   {
     if( rrec->fail_fn)
-      (*rrec->fail_fn)(subrec, rrec, question_name);
+      (*(register_name_fail_function)rrec->fail_fn)(subrec, rrec, question_name);
     /* Remove the name. */
     standard_fail_register( subrec, rrec, question_name);
   }
@@ -310,12 +308,12 @@ static BOOL multihomed_register_name( struct nmb_name *nmbname, uint16 nb_flags,
       DEBUG(0,("multihomed_register_name: Failed to send packet trying to \
 register name %s IP %s\n", nmb_namestr(nmbname), inet_ntoa(ip_list[i]) ));
 
-      free((char *)ip_list);
+      SAFE_FREE(ip_list);
       return True;
     }
   }
 
-  free((char *)ip_list);
+  SAFE_FREE(ip_list);
 
   return False;
 }