- fixed bugs in nmb response packet checking.

- added multiple workgroup code - samba can register under different
  (unique) NetBIOS aliases, one per workgroup it joins.

lkcl
(This used to be commit f24e341e7e4d8726b98d3a0f83b24f61817fe536)

2 files changed, 124 insertions, 283 deletions

diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h
index e4876bac57..404c0531e5 100644
--- a/source3/include/nameserv.h
+++ b/source3/include/nameserv.h
@@ -99,19 +99,19 @@ enum master_state
 
 enum state_type
 {
-	NAME_STATUS_DOM_SRV_CHK,
-	NAME_STATUS_SRV_CHK,
-	NAME_REGISTER_CHALLENGE,
-	NAME_REGISTER,
-	NAME_RELEASE,
-	NAME_QUERY_CONFIRM,
-	NAME_QUERY_ANNOUNCE_HOST,
-	NAME_QUERY_SYNC_LOCAL,
-	NAME_QUERY_SYNC_REMOTE,
-	NAME_QUERY_DOM_SRV_CHK,
-	NAME_QUERY_SRV_CHK,
-	NAME_QUERY_FIND_MST,
-	NAME_QUERY_MST_CHK
+    NAME_STATUS_DOM_SRV_CHK,
+    NAME_STATUS_SRV_CHK,
+    NAME_REGISTER_CHALLENGE,
+    NAME_REGISTER,
+    NAME_RELEASE,
+    NAME_QUERY_CONFIRM,
+    NAME_QUERY_ANNOUNCE_HOST,
+    NAME_QUERY_SYNC_LOCAL,
+    NAME_QUERY_SYNC_REMOTE,
+    NAME_QUERY_DOM_SRV_CHK,
+    NAME_QUERY_SRV_CHK,
+    NAME_QUERY_FIND_MST,
+    NAME_QUERY_MST_CHK
 };
 
 /* a netbios name structure */
@@ -121,6 +121,14 @@ struct nmb_name {
   int name_type;
 };
 
+/* A server name and comment. */
+struct server_identity
+{
+    char *name;
+    char *comment;
+    struct server_identity *next;
+};
+
 /* a netbios flags + ip address structure */
 /* this is used for multi-homed systems and for internet group names */
 struct nmb_ip
@@ -148,16 +156,16 @@ struct name_record
 /* browse and backup server cache for synchronising browse list */
 struct browse_cache_record
 {
-	struct browse_cache_record *next;
-	struct browse_cache_record *prev;
-
-	pstring name;
-	int type;
-	pstring group;
-	struct in_addr ip;
-	time_t sync_time;
-	BOOL synced;
-	BOOL local;
+    struct browse_cache_record *next;
+    struct browse_cache_record *prev;
+
+    pstring name;
+    int type;
+    pstring group;
+    struct in_addr ip;
+    time_t sync_time;
+    BOOL synced;
+    BOOL local;
 };
 
 /* this is used to hold the list of servers in my domain, and is */
@@ -214,9 +222,10 @@ struct response_record
   int fd;
   int quest_type;
   struct nmb_name name;
-  int nb_flags;
+  struct nmb_ip reply;
   time_t ttl;
 
+  int token; /* unique workgroup token id */
   int server_type;
   fstring my_name;
   fstring my_comment;
@@ -224,7 +233,6 @@ struct response_record
   BOOL bcast;
   BOOL recurse;
   struct in_addr send_ip;
-  struct in_addr reply_to_ip;
 
   int num_msgs;
 
diff --git a/source3/include/proto.h b/source3/include/proto.h
index e20238fee4..293179d4ab 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1,39 +1,24 @@
 /* This file is automatically generated with "make proto". DO NOT EDIT */
 
 
-/*The following definitions come from  access.c  */
+/*The following definitions come from  -  */
 
 BOOL check_access(int snum);
 BOOL allow_access(char *deny_list,char *allow_list,struct from_host *client);
 BOOL fromhost(int sock,struct from_host *f);
-
-/*The following definitions come from  charcnv.c  */
-
 char *unix2dos_format(char *str,BOOL overwrite);
 char *dos2unix_format(char *str, BOOL overwrite);
 int interpret_character_set(char *str, int def);
-
-/*The following definitions come from  charset.c  */
-
 void charset_initialise(void);
 void add_char_string(char *s);
-
-/*The following definitions come from  chgpasswd.c  */
-
 BOOL chat_with_program(char *passwordprogram,char *name,char *chatsequence);
 BOOL chgpasswd(char *name,char *oldpass,char *newpass);
 BOOL chgpasswd(char *name,char *oldpass,char *newpass);
-
-/*The following definitions come from  client.c  */
-
 void setup_pkt(char *outbuf);
 void do_dir(char *inbuf,char *outbuf,char *Mask,int attribute,void (*fn)(),BOOL recurse_dir);
 void cmd_help(void);
 BOOL reopen_connection(char *inbuf,char *outbuf);
 char *smb_errstr(char *inbuf);
-
-/*The following definitions come from  clientutil.c  */
-
 void cli_setup_pkt(char *outbuf);
 BOOL cli_receive_trans_response(char *inbuf,int trans,int *data_len,
 				int *param_len, char **data,char **param);
@@ -48,9 +33,6 @@ BOOL cli_send_trans_request(char *outbuf, int trans, char *name, int fid, int fl
 BOOL cli_open_sockets(int port);
 BOOL cli_reopen_connection(char *inbuf,char *outbuf);
 char *smb_errstr(char *inbuf);
-
-/*The following definitions come from  clitar.c  */
-
 int strslashcmp(const char *s1, const char *s2);
 void cmd_block(void);
 void cmd_tarmode(void);
@@ -59,9 +41,6 @@ void cmd_tar(char *inbuf, char *outbuf);
 int process_tar(char *inbuf, char *outbuf);
 int clipfind(char **aret, int ret, char *tok);
 int tar_parseargs(int argc, char *argv[], char *Optarg, int Optind);
-
-/*The following definitions come from  dir.c  */
-
 void init_dptrs(void);
 char *dptr_path(int key);
 char *dptr_wcard(int key);
@@ -87,17 +66,8 @@ int TellDir(void *p);
 void DirCacheAdd(char *path,char *name,char *dname,int snum);
 char *DirCacheCheck(char *path,char *name,int snum);
 void DirCacheFlush(int snum);
-
-/*The following definitions come from  fault.c  */
-
 void fault_setup(void (*fn)());
-
-/*The following definitions come from  getsmbpass.c  */
-
 char *getsmbpass(char *prompt)    ;
-
-/*The following definitions come from  interface.c  */
-
 void load_interfaces(void);
 void iface_set_default(char *ip,char *bcast,char *nmask);
 BOOL ismyip(struct in_addr ip);
@@ -107,23 +77,15 @@ struct in_addr *iface_n_ip(int n);
 struct in_addr *iface_bcast(struct in_addr ip);
 struct in_addr *iface_nmask(struct in_addr ip);
 struct in_addr *iface_ip(struct in_addr ip);
-
-/*The following definitions come from  ipc.c  */
-
 int reply_trans(char *inbuf,char *outbuf);
-
-/*The following definitions come from  kanji.c  */
-
 int interpret_coding_system(char *str, int def);
-
-/*The following definitions come from  loadparm.c  */
-
 char *lp_string(char *s);
 char *lp_logfile(void);
 char *lp_smbrun(void);
 char *lp_configfile(void);
 char *lp_smb_passwd_file(void);
 char *lp_serverstring(void);
+char *lp_server_comment(void);
 char *lp_printcapname(void);
 char *lp_lockdir(void);
 char *lp_rootdir(void);
@@ -146,6 +108,7 @@ char *lp_interfaces(void);
 char *lp_socket_address(void);
 BOOL lp_wins_support(void);
 BOOL lp_wins_proxy(void);
+BOOL lp_local_master(void);
 BOOL lp_domain_master(void);
 BOOL lp_domain_logons(void);
 BOOL lp_preferred_master(void);
@@ -251,9 +214,6 @@ int lp_numservices(void);
 void lp_dump(void);
 int lp_servicenumber(char *pszServiceName);
 char *volume_label(int snum);
-
-/*The following definitions come from  locking.c  */
-
 BOOL fcntl_lock(int fd,int op,uint32 offset,uint32 count,int type);
 int file_lock(char *name,int timeout);
 void file_unlock(int fd);
@@ -268,9 +228,6 @@ int get_share_mode(int cnum,struct stat *sbuf,int *pid);
 void del_share_mode(int fnum);
 BOOL set_share_mode(int fnum,int mode);
 void clean_share_modes(void);
-
-/*The following definitions come from  mangle.c  */
-
 int str_checksum(char *s);
 BOOL is_8_3(char *fname);
 void create_mangled_stack(int size);
@@ -278,192 +235,157 @@ BOOL check_mangled_stack(char *s);
 BOOL is_mangled(char *s);
 void mangle_name_83(char *s);
 BOOL name_map_mangle(char *OutName,BOOL need83,int snum);
-
-/*The following definitions come from  md4.c  */
-
-
-/*The following definitions come from  message.c  */
-
 int reply_sends(char *inbuf,char *outbuf);
 int reply_sendstrt(char *inbuf,char *outbuf);
 int reply_sendtxt(char *inbuf,char *outbuf);
 int reply_sendend(char *inbuf,char *outbuf);
-
-/*The following definitions come from  nameannounce.c  */
-
 void announce_request(struct work_record *work, struct in_addr ip);
-void do_announce_request(char *info, char *to_name, int announce_type, 
-			 int from,
-			 int to, struct in_addr dest_ip);
+void do_announce_request(char *info, char *from_name, char *to_name,
+             int announce_type, int from, int to, struct in_addr dest_ip);
 void sync_server(enum state_type state, char *serv_name, char *work_name, 
-		 int name_type,
-		 struct in_addr ip);
+         int name_type,
+         struct in_addr ip);
 void do_announce_host(int command,
-		char *from_name, int from_type, struct in_addr from_ip,
-		char *to_name  , int to_type  , struct in_addr to_ip,
-		time_t announce_interval,
-		char *server_name, int server_type, char *server_comment);
+        char *from_name, int from_type, struct in_addr from_ip,
+        char *to_name  , int to_type  , struct in_addr to_ip,
+        time_t announce_interval,
+        char *server_name, int server_type, char *server_comment);
 void remove_my_servers(void);
 void announce_server(struct subnet_record *d, struct work_record *work,
-		     char *name, char *comment, time_t ttl, int server_type);
+             char *name, char *comment, time_t ttl, int server_type);
 void announce_host(void);
 void announce_master(void);
 void announce_remote(void);
-
-/*The following definitions come from  namebrowse.c  */
-
 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, BOOL local);
+                          time_t ttl, struct in_addr ip, BOOL local);
 void do_browser_lists(void);
-
-/*The following definitions come from  namedbname.c  */
-
+int get_num_workgroups(void);
+int conf_workgroup_name_to_token(const char *workgroup_name,
+								 const char *default_name);
+char *conf_workgroup_name(int token);
+int conf_should_workgroup_member(int token);
+int conf_should_local_master(int token);
+int conf_should_domain_master(int token);
+char *conf_browsing_alias(int token);
+char *conf_browsing_alias_comment(int token);
+char *conf_alias_to_workgroup(const char *alias);
+int conf_alias_to_token(const char *alias);
+void read_smbbrowse_conf(char *default_name);
 void set_samba_nb_type(void);
 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);
 struct name_record *find_name(struct name_record *n,
-			struct nmb_name *name,
-			int search);
+            struct nmb_name *name,
+            int search);
 struct name_record *find_name_search(struct subnet_record **d,
-			struct nmb_name *name,
-			int search, struct in_addr ip);
+            struct nmb_name *name,
+            int search, struct in_addr ip);
 void dump_names(void);
 void load_netbios_names(void);
 void remove_netbios_name(struct subnet_record *d,
-			char *name,int type, enum name_source source,
-			 struct in_addr ip);
+            char *name,int type, enum name_source source,
+             struct in_addr ip);
 struct name_record *add_netbios_entry(struct subnet_record *d,
-		char *name, int type, int nb_flags, 
-		int ttl, enum name_source source, struct in_addr ip,
-		BOOL new_only,BOOL wins);
-void expire_names(time_t t);
+        char *name, int type, int nb_flags, 
+        int ttl, enum name_source source, struct in_addr ip,
+        BOOL new_only,BOOL wins);
+void check_expire_names(time_t t);
 struct name_record *search_for_name(struct subnet_record **d,
-					struct nmb_name *question,
-				    struct in_addr ip, int Time, int search);
-
-/*The following definitions come from  namedbresp.c  */
-
+                    struct nmb_name *question,
+                    struct in_addr ip, int Time, int search);
 void add_response_record(struct subnet_record *d,
 				struct response_record *n);
 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,uint16 fd,
-				int quest_type, char *name,int type, int nb_flags, time_t ttl,
+				int id,uint16 fd, int quest_type,
+                int token, char *name,int type, int nb_flags, time_t ttl,
 				int server_type, char *my_name, char *my_comment,
 				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);
-
-/*The following definitions come from  namedbserver.c  */
-
 void remove_old_servers(struct work_record *work, time_t t,
-					BOOL remove_all);
+                    BOOL remove_all);
 struct server_record *find_server(struct work_record *work, char *name);
 struct server_record *add_server_entry(struct subnet_record *d, 
-				       struct work_record *work,
-				       char *name,int servertype, 
-				       int ttl,char *comment,
-				       BOOL replace);
+                       struct work_record *work,
+                       char *name,int servertype, 
+                       int ttl,char *comment,
+                       BOOL replace);
 void expire_servers(time_t t);
-
-/*The following definitions come from  namedbsubnet.c  */
-
 struct subnet_record *find_subnet(struct in_addr bcast_ip);
 struct subnet_record *find_req_subnet(struct in_addr ip, BOOL bcast);
 void add_subnet_interfaces(void);
 void add_my_subnets(char *group);
 struct subnet_record *add_subnet_entry(struct in_addr bcast_ip, 
-				       struct in_addr mask_ip,
-				       char *name, BOOL add, BOOL lmhosts);
+                       struct in_addr mask_ip,
+                       char *name, BOOL add, BOOL lmhosts);
 void write_browse_list(void);
-
-/*The following definitions come from  namedbwork.c  */
-
 struct work_record *remove_workgroup(struct subnet_record *d, 
-				     struct work_record *work,
-					 BOOL remove_all_servers);
+                     struct work_record *work,
+                     BOOL remove_all_servers);
 struct work_record *find_workgroupstruct(struct subnet_record *d, 
-					 fstring name, BOOL add);
+                     fstring name, BOOL add);
 void dump_workgroups(void);
-
-/*The following definitions come from  nameelect.c  */
-
 void check_master_browser(void);
 void browser_gone(char *work_name, struct in_addr ip);
 void send_election(struct subnet_record *d, char *group,uint32 criterion,
-		   int timeup,char *name);
+           int timeup,char *name);
 void name_unregister_work(struct subnet_record *d, char *name, int name_type);
-void name_register_work(struct subnet_record *d, char *name, int name_type,
-				int nb_flags, time_t ttl, struct in_addr ip, BOOL bcast);
+void name_register_work(struct subnet_record *d, int token,
+                char *name, int name_type,
+                struct nmb_ip *data, time_t ttl, struct in_addr ip, BOOL bcast);
 void become_master(struct subnet_record *d, struct work_record *work);
 void become_nonmaster(struct subnet_record *d, struct work_record *work,
-				int remove_type);
+                int remove_type);
 void run_elections(void);
 void process_election(struct packet_struct *p,char *buf);
 BOOL check_elections(void);
-
-/*The following definitions come from  namelogon.c  */
-
 void process_logon_packet(struct packet_struct *p,char *buf,int len);
-
-/*The following definitions come from  namepacket.c  */
-
 void debug_browse_data(char *outbuf, int len);
-void initiate_netbios_packet(uint16 *id,
-				int fd,int quest_type,char *name,int name_type,
-			    int nb_flags,BOOL bcast,BOOL recurse,
-			    struct in_addr to_ip);
+BOOL initiate_netbios_packet(uint16 id,
+                int fd,int quest_type,char *name,int name_type,
+                int nb_flags,BOOL bcast,BOOL recurse,
+                struct in_addr to_ip);
 void reply_netbios_packet(struct packet_struct *p1,int trn_id,
-				int rcode, int rcv_code, int opcode, BOOL recurse,
-				struct nmb_name *rr_name,int rr_type,int rr_class,int ttl,
-				char *data,int len);
+                int rcode, int rcv_code, int opcode, BOOL recurse,
+                struct nmb_name *rr_name,int rr_type,int rr_class,int ttl,
+                char *data,int len);
 void queue_packet(struct packet_struct *packet);
 void run_packet_queue();
 void listen_for_packets(BOOL run_election);
 BOOL send_mailslot_reply(char *mailslot,int fd,char *buf,int len,char *srcname,
-			 char *dstname,int src_type,int dest_type,
-			 struct in_addr dest_ip,struct in_addr src_ip);
-
-/*The following definitions come from  namequery.c  */
-
+             char *dstname,int src_type,int dest_type,
+             struct in_addr dest_ip,struct in_addr src_ip);
 BOOL name_status(int fd,char *name,int name_type,BOOL recurse,
 		 struct in_addr to_ip,char *master,char *rname,
 		 void (*fn)());
 BOOL name_query(int fd,char *name,int name_type, 
 		BOOL bcast,BOOL recurse,
 		struct in_addr to_ip, struct in_addr *ip,void (*fn)());
-
-/*The following definitions come from  nameresp.c  */
-
+void update_name_trn_id(void);
 void expire_netbios_response_entries();
-struct response_record *queue_netbios_pkt_wins(struct subnet_record *d,
-				int fd,int quest_type,enum state_type state,
-			    char *name,int name_type,int nb_flags, time_t ttl,
-				int server_type, char *my_name, char *my_comment,
-			    BOOL bcast,BOOL recurse,
-				struct in_addr send_ip, struct in_addr reply_to_ip);
-struct response_record *queue_netbios_packet(struct subnet_record *d,
-			int fd,int quest_type,enum state_type state,char *name,
-			int name_type,int nb_flags, time_t ttl,
-			int server_type, char *my_name, char *my_comment,
-		    BOOL bcast,BOOL recurse,
-			struct in_addr send_ip, struct in_addr reply_to_ip);
-
-/*The following definitions come from  nameserv.c  */
-
-void remove_name_entry(struct subnet_record *d, char *name,int type);
-void add_my_name_entry(struct subnet_record *d,char *name,int type,int nb_flags);
+void queue_netbios_pkt_wins(struct subnet_record *d,
+                int fd,int quest_type,enum state_type state,
+                int token, char *name,int name_type,int nb_flags, time_t ttl,
+                int server_type, char *my_name, char *my_comment,
+                BOOL bcast,BOOL recurse,
+                struct in_addr send_ip, struct in_addr reply_to_ip);
+void queue_netbios_packet(struct subnet_record *d,
+            int fd,int quest_type,enum state_type state,
+            int token, char *name, int name_type,int nb_flags, time_t ttl,
+            int server_type, char *my_name, char *my_comment,
+            BOOL bcast,BOOL recurse,
+            struct in_addr send_ip, struct in_addr reply_to_ip);
+void remove_name_entry(struct subnet_record *d, int token, char *name,int type);
+void add_my_name_entry(struct subnet_record *d, int token,
+                       char *name,int type,int nb_flags);
 void add_my_names(void);
 void remove_my_names();
-void refresh_my_names(time_t t);
 void query_refresh_names(void);
-
-/*The following definitions come from  nameservreply.c  */
-
 void add_name_respond(struct subnet_record *d, int fd, struct in_addr from_ip,
 				uint16 response_id,
 				struct nmb_name *name,
@@ -477,25 +399,18 @@ void reply_name_release(struct packet_struct *p);
 void reply_name_reg(struct packet_struct *p);
 void reply_name_status(struct packet_struct *p);
 void reply_name_query(struct packet_struct *p);
-
-/*The following definitions come from  nameservresp.c  */
-
 void debug_state_type(int state);
+void response_process(struct in_addr ip, struct subnet_record *d,
+                struct response_record *n, 
+                int rcode, char *nmb_data, struct nmb_name *q_name,
+                time_t ttl, BOOL bcast, struct nmb_name *ans_name);
 void response_netbios_packet(struct packet_struct *p);
-
-/*The following definitions come from  namework.c  */
-
-void reset_server(char *name, int state, struct in_addr ip);
+void reset_server(struct work_record *work, char *name, int state, struct in_addr ip);
 void tell_become_backup(void);
 BOOL same_context(struct dgram_packet *dgram);
+BOOL listening_name(struct work_record *work, struct nmb_name *n);
 void process_browse_packet(struct packet_struct *p,char *buf,int len);
-
-/*The following definitions come from  nmbd.c  */
-
 BOOL reload_services(BOOL test);
-
-/*The following definitions come from  nmblib.c  */
-
 void debug_nmb_packet(struct packet_struct *p);
 char *namestr(struct nmb_name *n);
 void free_nmb_packet(struct nmb_packet *nmb);
@@ -504,23 +419,11 @@ struct packet_struct *read_packet(int fd,enum packet_type packet_type);
 void make_nmb_name(struct nmb_name *n,char *name,int type,char *this_scope);
 BOOL send_packet(struct packet_struct *p);
 struct packet_struct *receive_packet(int fd,enum packet_type type,int t);
-
-/*The following definitions come from  nmblookup.c  */
-
 int main(int argc,char *argv[]);
-
-/*The following definitions come from  nmbsync.c  */
-
 char *getsmbpass(char *pass);
 void sync_browse_lists(struct subnet_record *d, struct work_record *work,
-		char *name, int nm_type, struct in_addr ip, BOOL local);
-
-/*The following definitions come from  params.c  */
-
+        char *name, int nm_type, struct in_addr ip, BOOL local);
 BOOL pm_process(char *pszFileName,BOOL (*sfunc)(char *),BOOL (*pfunc)(char *,char *));
-
-/*The following definitions come from  password.c  */
-
 void generate_next_challenge(char *challenge);
 BOOL set_challenge(char *challenge);
 BOOL last_challenge(char *challenge);
@@ -540,14 +443,8 @@ BOOL authorise_login(int snum,char *user,char *password, int pwlen,
 BOOL check_hosts_equiv(char *user);
 BOOL server_cryptkey(char *buf);
 BOOL server_validate(char *buf);
-
-/*The following definitions come from  pcap.c  */
-
 BOOL pcap_printername_ok(char *pszPrintername, char *pszPrintcapname);
 void pcap_printer_fn(void (*fn)());
-
-/*The following definitions come from  pipes.c  */
-
 int reply_open_pipe_and_X(char *inbuf,char *outbuf,int length,int bufsize);
 BOOL api_LsarpcSNPHS(int cnum,int uid, char *param,char *data,
 		     int mdrcnt,int mprcnt,
@@ -557,31 +454,19 @@ BOOL api_LsarpcTNP(int cnum,int uid, char *param,char *data,
 		     int mdrcnt,int mprcnt,
 		     char **rdata,char **rparam,
 		     int *rdata_len,int *rparam_len);
-
-/*The following definitions come from  predict.c  */
-
 int read_predict(int fd,int offset,char *buf,char **ptr,int num);
 void do_read_prediction();
 void invalidate_read_prediction(int fd);
-
-/*The following definitions come from  printing.c  */
-
 void lpq_reset(int snum);
 void print_file(int fnum);
 int get_printqueue(int snum,int cnum,print_queue_struct **queue,
 		   print_status_struct *status);
 void del_printqueue(int cnum,int snum,int jobid);
 void status_printjob(int cnum,int snum,int jobid,int status);
-
-/*The following definitions come from  quotas.c  */
-
 BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize);
 BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize);
 BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize);
 BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize);
-
-/*The following definitions come from  replace.c  */
-
 char *Strstr(char *s, char *p);
 time_t Mktime(struct tm      *t);
 int InNetGr(char *group,char *host,char *user,char *dom);
@@ -589,9 +474,6 @@ void *malloc_wrapped(int size,char *file,int line);
 void *realloc_wrapped(void *ptr,int size,char *file,int line);
 void free_wrapped(void *ptr,char *file,int line);
 void *memcpy_wrapped(void *d,void *s,int l,char *fname,int line);
-
-/*The following definitions come from  reply.c  */
-
 int reply_special(char *inbuf,char *outbuf);
 int reply_tcon(char *inbuf,char *outbuf);
 int reply_tcon_and_X(char *inbuf,char *outbuf,int length,int bufsize);
@@ -642,9 +524,6 @@ int reply_writebmpx(char *inbuf,char *outbuf);
 int reply_writebs(char *inbuf,char *outbuf);
 int reply_setattrE(char *inbuf,char *outbuf);
 int reply_getattrE(char *inbuf,char *outbuf);
-
-/*The following definitions come from  server.c  */
-
 mode_t unix_mode(int cnum,int dosmode);
 int dos_mode(int cnum,char *path,struct stat *sbuf);
 int dos_chmod(int cnum,char *fname,int dosmode,struct stat *st);
@@ -685,9 +564,6 @@ void standard_sub(int cnum,char *s);
 char *smb_fn_name(int type);
 int chain_reply(char *inbuf,char *outbuf,int size,int bufsize);
 int construct_reply(char *inbuf,char *outbuf,int size,int bufsize);
-
-/*The following definitions come from  shmem.c  */
-
 BOOL shm_open( char *file_name, int size);
 BOOL shm_close( void );
 shm_offset_t shm_alloc(int size);
@@ -701,9 +577,6 @@ BOOL shm_unlock(void);
 BOOL shm_get_usage(int *bytes_free,
 		   int *bytes_used,
 		   int *bytes_overhead);
-
-/*The following definitions come from  smbencrypt.c  */
-
 void str_to_key(uchar *str,uchar *key);
 void D1(uchar *k, uchar *d, uchar *out);
 void E1(uchar *k, uchar *d, uchar *out);
@@ -712,28 +585,13 @@ void E_P24(uchar *p21, uchar *c8, uchar *p24);
 void SMBencrypt(uchar *passwd, uchar *c8, uchar *p24);
 void E_md4hash(uchar *passwd, uchar *p16);
 void SMBNTencrypt(uchar *passwd, uchar *c8, uchar *p24);
-
-/*The following definitions come from  smbpass.c  */
-
 int pw_file_lock(char *name, int type, int secs);
 int pw_file_unlock(int fd);
 struct smb_passwd *get_smbpwnam(char *name);
-
-/*The following definitions come from  smbpasswd.c  */
-
-
-/*The following definitions come from  smbrun.c  */
-
-
-/*The following definitions come from  status.c  */
-
 void Ucrit_addUsername(pstring username);
 unsigned int Ucrit_checkUsername(pstring username);
 void Ucrit_addPid(int pid);
 unsigned int   Ucrit_checkPid(int pid);
-
-/*The following definitions come from  system.c  */
-
 int sys_select(fd_set *fds,struct timeval *tval);
 int sys_select(fd_set *fds,struct timeval *tval);
 int sys_unlink(char *fname);
@@ -749,16 +607,7 @@ int sys_rename(char *from, char *to);
 int sys_chmod(char *fname,int mode);
 int sys_chown(char *fname,int uid,int gid);
 int sys_chroot(char *dname);
-
-/*The following definitions come from  testparm.c  */
-
-
-/*The following definitions come from  testprns.c  */
-
 int main(int argc, char *argv[]);
-
-/*The following definitions come from  time.c  */
-
 void GetTimeOfDay(struct timeval *tval);
 void TimeInit(void);
 int TimeDiff(time_t t);
@@ -773,35 +622,22 @@ time_t make_unix_date2(void *date_ptr);
 time_t make_unix_date3(void *date_ptr);
 BOOL set_filetime(char *fname,time_t mtime);
 char *timestring(void );
-
-/*The following definitions come from  trans2.c  */
-
 int reply_findclose(char *inbuf,char *outbuf,int length,int bufsize);
 int reply_findnclose(char *inbuf,char *outbuf,int length,int bufsize);
 int reply_transs2(char *inbuf,char *outbuf,int length,int bufsize);
 int reply_trans2(char *inbuf,char *outbuf,int length,int bufsize);
-
-/*The following definitions come from  ufc.c  */
-
 char *ufc_crypt(char *key,char *salt);
-
-/*The following definitions come from  uid.c  */
-
 void init_uid(void);
 BOOL become_guest(void);
 BOOL become_user(int cnum, int uid);
 BOOL unbecome_user(void );
 int smbrun(char *cmd,char *outfile);
-
-/*The following definitions come from  username.c  */
-
+void write_utmp(int dologin, int connection, int pid,
+                char *from_addr, char *username);
 char *get_home_dir(char *user);
 void map_username(char *user);
 struct passwd *Get_Pwnam(char *user,BOOL allow_change);
 BOOL user_in_list(char *user,char *list);
-
-/*The following definitions come from  util.c  */
-
 void setup_logging(char *pname,BOOL interactive);
 void reopen_logs(void);
 BOOL is_a_socket(int fd);
@@ -821,9 +657,9 @@ time_t file_modtime(char *fname);
 BOOL directory_exist(char *dname,struct stat *st);
 uint32 file_size(char *file_name);
 char *attrib_string(int mode);
-int StrCaseCmp(char *s, char *t);
-int StrnCaseCmp(char *s, char *t, int n);
-BOOL strequal(char *s1,char *s2);
+int StrCaseCmp(const char *s, const char *t);
+int StrnCaseCmp(const char *s, const char *t, int n);
+BOOL strequal(const char *s1, const char *s2);
 BOOL strnequal(char *s1,char *s2,int n);
 BOOL strcsequal(char *s1,char *s2);
 void strlower(char *s);
@@ -908,9 +744,6 @@ char *gidtoname(int gid);
 void BlockSignals(BOOL block,int signum);
 void ajt_panic(void);
 char *readdirname(void *p);
-
-/*The following definitions come from  vt_mode.c  */
-
 int	VT_Check(char	*buffer);
 int VT_Start_utmp(void);
 int VT_Stop_utmp(void);