missed nmbd.c in previous update.

did a make proto

lkcl

2 files changed, 7 insertions, 25 deletions

diff --git a/source/include/proto.h b/source/include/proto.h
index 437a7e25b9a..af5ed8bf41c 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -251,26 +251,6 @@ void expire_browse_cache(time_t t);
 struct browse_cache_record *add_browser_entry(char *name, int type, char *wg,
 					      time_t ttl, struct in_addr ip);
 void do_browser_lists(void);
-void remove_old_servers(struct work_record *work, time_t t);
-struct work_record *remove_workgroup(struct subnet_record *d, 
-				     struct work_record *work);
-struct work_record *find_workgroupstruct(struct subnet_record *d, 
-					 fstring name, BOOL add);
-struct subnet_record *find_subnet(struct in_addr bcast_ip);
-void dump_workgroups(void);
-void add_subnet_interfaces(void);
-struct subnet_record *add_subnet_entry(struct in_addr bcast_ip, 
-				       struct in_addr mask_ip,
-				       char *name, BOOL add, BOOL lmhosts);
-void remove_my_servers(void);
-struct server_record *add_server_entry(struct subnet_record *d, 
-				       struct work_record *work,
-				       char *name,int servertype, 
-				       int ttl,char *comment,
-				       BOOL replace);
-void add_my_subnets(char *group);
-void write_browse_list(void);
-void expire_servers(time_t t);
 BOOL name_equal(struct nmb_name *n1,struct nmb_name *n2);
 BOOL ms_browser_name(char *name, int type);
 void remove_name(struct subnet_record *d, struct name_record *n);
@@ -298,13 +278,14 @@ void add_response_record(struct subnet_record *d,
 void remove_response_record(struct subnet_record *d,
 				struct response_record *n);
 struct response_record *make_response_queue_record(enum state_type state,
-				int id,int fd,
+				int id,uint16 fd,
 				int quest_type, char *name,int type, int nb_flags, time_t ttl,
 				BOOL bcast,BOOL recurse,
 				struct in_addr send_ip, struct in_addr reply_to_ip);
 struct response_record *find_response_record(struct subnet_record **d,
 				uint16 id);
-void remove_old_servers(struct work_record *work, time_t t);
+void remove_old_servers(struct work_record *work, time_t t,
+					BOOL remove_all);
 struct server_record *add_server_entry(struct subnet_record *d, 
 				       struct work_record *work,
 				       char *name,int servertype, 
@@ -320,7 +301,8 @@ struct subnet_record *add_subnet_entry(struct in_addr bcast_ip,
 				       char *name, BOOL add, BOOL lmhosts);
 void write_browse_list(void);
 struct work_record *remove_workgroup(struct subnet_record *d, 
-				     struct work_record *work);
+				     struct work_record *work,
+					 BOOL remove_all_servers);
 struct work_record *find_workgroupstruct(struct subnet_record *d, 
 					 fstring name, BOOL add);
 void dump_workgroups(void);
diff --git a/source/nmbd/nmbd.c b/source/nmbd/nmbd.c
index 187ef8e7b72..40cb06aad4b 100644
--- a/source/nmbd/nmbd.c
+++ b/source/nmbd/nmbd.c
@@ -63,16 +63,16 @@ static int sig_term()
   
   DEBUG(0,("Got SIGTERM: going down...\n"));
   
+  /* write out wins.dat file if samba is a WINS server */
   dump_names();
-  reload_services(True);
   
   /* remove all samba names, with wins server if necessary. */
   remove_my_names();
   
   /* announce all server entries as 0 time-to-live, 0 type */
+  /* XXXX don't care if we never receive a response back... yet */
   remove_my_servers();
 
-  /* XXXX don't care if we never receive a response back... yet */
   /* XXXX other things: if we are a master browser, force an election? */
   
   exit(0);