- 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)

1 files changed, 6 insertions, 4 deletions

diff --git a/source3/namedbresp.c b/source3/namedbresp.c
index d89bfe8ae8..10a9523b8d 100644
--- a/source3/namedbresp.c
+++ b/source3/namedbresp.c
@@ -92,8 +92,8 @@ void remove_response_record(struct subnet_record *d,
   create a name query response record
   **************************************************************************/
 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)
@@ -109,14 +109,16 @@ struct response_record *make_response_queue_record(enum state_type state,
   n->state = state;
   n->fd = fd;
   n->quest_type = quest_type;
+
+  n->token = token;
   make_nmb_name(&n->name, name, type, scope);
-  n->nb_flags = nb_flags;
   n->ttl = ttl;
   n->server_type = server_type;
   n->bcast = bcast;
   n->recurse = recurse;
+  n->reply.nb_flags = nb_flags;
+  n->reply.ip = reply_to_ip;
   n->send_ip = send_ip;
-  n->reply_to_ip = reply_to_ip;
   StrnCpy(my_name   , n->my_name   , sizeof(n->my_name   )-1);
   StrnCpy(my_comment, n->my_comment, sizeof(n->my_comment)-1);