updated the 3.0 branch from the head branch - ready for alpha18
[sfrench/samba-autobuild/.git] / source3 / libsmb / namequery.c
index 290a91f7b5c8080c8b9ecd980c5c204ba85e3901..18564bccf43e4fa344ace85a89bf405b64df7c96 100644 (file)
@@ -1,6 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 1.9.
+   Unix SMB/CIFS implementation.
    name query routines
    Copyright (C) Andrew Tridgell 1994-1998
    
@@ -22,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /* nmbd.c sets this to True. */
 BOOL global_in_nmbd = False;
 
@@ -35,308 +32,434 @@ static int generate_trn_id(void)
        static int trn_id;
 
        if (trn_id == 0) {
-               srandom(getpid());
+               sys_srandom(sys_getpid());
        }
 
-       trn_id = random();
+       trn_id = sys_random();
 
        return trn_id % (unsigned)0x7FFF;
 }
 
 
 /****************************************************************************
- Interpret a node status response.
+ parse a node status response into an array of structures
 ****************************************************************************/
-
-static void _interpret_node_status(char *p, char *master,char *rname)
+static struct node_status *parse_node_status(char *p, int *num_names)
 {
-  int numnames = CVAL(p,0);
-  DEBUG(1,("received %d names\n",numnames));
-
-  if (rname) *rname = 0;
-  if (master) *master = 0;
-
-  p += 1;
-  while (numnames--) {
-    char qname[17];
-    int type;
-    fstring flags;
-    int i;
-    *flags = 0;
-    StrnCpy(qname,p,15);
-    type = CVAL(p,15);
-    p += 16;
-
-    fstrcat(flags, (p[0] & 0x80) ? "<GROUP> " : "        ");
-    if ((p[0] & 0x60) == 0x00) fstrcat(flags,"B ");
-    if ((p[0] & 0x60) == 0x20) fstrcat(flags,"P ");
-    if ((p[0] & 0x60) == 0x40) fstrcat(flags,"M ");
-    if ((p[0] & 0x60) == 0x60) fstrcat(flags,"H ");
-    if (p[0] & 0x10) fstrcat(flags,"<DEREGISTERING> ");
-    if (p[0] & 0x08) fstrcat(flags,"<CONFLICT> ");
-    if (p[0] & 0x04) fstrcat(flags,"<ACTIVE> ");
-    if (p[0] & 0x02) fstrcat(flags,"<PERMANENT> ");
-
-    if (master && !*master && type == 0x1d) {
-      StrnCpy(master,qname,15);
-      trim_string(master,NULL," ");
-    }
+       struct node_status *ret;
+       int i;
 
-    if (rname && !*rname && type == 0x20 && !(p[0]&0x80)) {
-      StrnCpy(rname,qname,15);
-      trim_string(rname,NULL," ");
-    }
-      
-    for (i = strlen( qname) ; --i >= 0 ; ) {
-      if (!isprint((int)qname[i])) qname[i] = '.';
-    }
-    DEBUG(1,("\t%-15s <%02x> - %s\n",qname,type,flags));
-    p+=2;
-  }
+       *num_names = CVAL(p,0);
+
+       if (*num_names == 0) return NULL;
 
-  DEBUG(1,("num_good_sends=%d num_good_receives=%d\n",
-              IVAL(p,20),IVAL(p,24)));
+       ret = (struct node_status *)malloc(sizeof(struct node_status)* (*num_names));
+       if (!ret) return NULL;
+
+       p++;
+       for (i=0;i< *num_names;i++) {
+               StrnCpy(ret[i].name,p,15);
+               trim_string(ret[i].name,NULL," ");
+               ret[i].type = CVAL(p,15);
+               ret[i].flags = p[16];
+               p += 18;
+               DEBUG(10, ("%s#%02x: flags = 0x%02x\n", ret[i].name, 
+                          ret[i].type, ret[i].flags));
+       }
+       return ret;
 }
 
+
 /****************************************************************************
- Internal function handling a netbios name status query on a host.
+do a NBT node status query on an open socket and return an array of
+structures holding the returned names or NULL if the query failed
 **************************************************************************/
-static BOOL internal_name_status(int fd,char *name,int name_type,BOOL recurse,
-                                struct in_addr to_ip,char *master,
-                                char *rname, BOOL verbose,
-                                void (*fn_interpret_node_status)(char *, char *,char *))
+struct node_status *node_status_query(int fd,struct nmb_name *name,
+                                     struct in_addr to_ip, int *num_names)
 {
-  BOOL found=False;
-  int retries = 2;
-  int retry_time = 5000;
-  struct timeval tval;
-  struct packet_struct p;
-  struct packet_struct *p2;
-  struct nmb_packet *nmb = &p.packet.nmb;
-
-  memset((char *)&p,'\0',sizeof(p));
-
-  nmb->header.name_trn_id = generate_trn_id();
-  nmb->header.opcode = 0;
-  nmb->header.response = False;
-  nmb->header.nm_flags.bcast = False;
-  nmb->header.nm_flags.recursion_available = False;
-  nmb->header.nm_flags.recursion_desired = False;
-  nmb->header.nm_flags.trunc = False;
-  nmb->header.nm_flags.authoritative = False;
-  nmb->header.rcode = 0;
-  nmb->header.qdcount = 1;
-  nmb->header.ancount = 0;
-  nmb->header.nscount = 0;
-  nmb->header.arcount = 0;
-
-  make_nmb_name(&nmb->question.question_name,name,name_type);
-
-  nmb->question.question_type = 0x21;
-  nmb->question.question_class = 0x1;
-
-  p.ip = to_ip;
-  p.port = NMB_PORT;
-  p.fd = fd;
-  p.timestamp = time(NULL);
-  p.packet_type = NMB_PACKET;
-
-  GetTimeOfDay(&tval);
-
-  if (!send_packet(&p)) 
-    return(False);
-
-  retries--;
-
-  while (1) {
-         struct timeval tval2;
-         GetTimeOfDay(&tval2);
-         if (TvalDiff(&tval,&tval2) > retry_time) {
-                 if (!retries)
-                         break;
-                 if (!found && !send_packet(&p))
-                         return False;
-                 GetTimeOfDay(&tval);
-                 retries--;
-         }
+       BOOL found=False;
+       int retries = 2;
+       int retry_time = 2000;
+       struct timeval tval;
+       struct packet_struct p;
+       struct packet_struct *p2;
+       struct nmb_packet *nmb = &p.packet.nmb;
+       struct node_status *ret;
+
+       ZERO_STRUCT(p);
+
+       nmb->header.name_trn_id = generate_trn_id();
+       nmb->header.opcode = 0;
+       nmb->header.response = False;
+       nmb->header.nm_flags.bcast = False;
+       nmb->header.nm_flags.recursion_available = False;
+       nmb->header.nm_flags.recursion_desired = False;
+       nmb->header.nm_flags.trunc = False;
+       nmb->header.nm_flags.authoritative = False;
+       nmb->header.rcode = 0;
+       nmb->header.qdcount = 1;
+       nmb->header.ancount = 0;
+       nmb->header.nscount = 0;
+       nmb->header.arcount = 0;
+       nmb->question.question_name = *name;
+       nmb->question.question_type = 0x21;
+       nmb->question.question_class = 0x1;
+
+       p.ip = to_ip;
+       p.port = NMB_PORT;
+       p.fd = fd;
+       p.timestamp = time(NULL);
+       p.packet_type = NMB_PACKET;
+       
+       GetTimeOfDay(&tval);
+  
+       if (!send_packet(&p)) 
+               return NULL;
 
-         if ((p2=receive_nmb_packet(fd,90,nmb->header.name_trn_id))) {     
-                 struct nmb_packet *nmb2 = &p2->packet.nmb;
-                 debug_nmb_packet(p2);
-
-                 if (nmb2->header.opcode != 0 ||
-                     nmb2->header.nm_flags.bcast ||
-                     nmb2->header.rcode ||
-                     !nmb2->header.ancount ||
-                     nmb2->answers->rr_type != 0x21) {
-                         /* XXXX what do we do with this? could be a
-                            redirect, but we'll discard it for the
-                            moment */
-                         free_packet(p2);
-                         continue;
-                 }
+       retries--;
 
-                 if(fn_interpret_node_status)
-                         (*fn_interpret_node_status)(&nmb2->answers->rdata[0],master,rname);
-                 free_packet(p2);
-                 return(True);
-         }
-  }
+       while (1) {
+               struct timeval tval2;
+               GetTimeOfDay(&tval2);
+               if (TvalDiff(&tval,&tval2) > retry_time) {
+                       if (!retries)
+                               break;
+                       if (!found && !send_packet(&p))
+                               return NULL;
+                       GetTimeOfDay(&tval);
+                       retries--;
+               }
 
-  if(verbose)
-         DEBUG(0,("No status response (this is not unusual)\n"));
+               if ((p2=receive_nmb_packet(fd,90,nmb->header.name_trn_id))) {     
+                       struct nmb_packet *nmb2 = &p2->packet.nmb;
+                       debug_nmb_packet(p2);
+                       
+                       if (nmb2->header.opcode != 0 ||
+                           nmb2->header.nm_flags.bcast ||
+                           nmb2->header.rcode ||
+                           !nmb2->header.ancount ||
+                           nmb2->answers->rr_type != 0x21) {
+                               /* XXXX what do we do with this? could be a
+                                  redirect, but we'll discard it for the
+                                  moment */
+                               free_packet(p2);
+                               continue;
+                       }
 
-  return(False);
+                       ret = parse_node_status(&nmb2->answers->rdata[0], num_names);
+                       free_packet(p2);
+                       return ret;
+               }
+       }
+       
+       return NULL;
 }
 
+
 /****************************************************************************
- Do a netbios name status query on a host.
- The "master" parameter is a hack used for finding workgroups.
+find the first type XX name in a node status reply - used for finding
+a servers name given its IP
+return the matched name in *name
 **************************************************************************/
-BOOL name_status(int fd,char *name,int name_type,BOOL recurse,
-                struct in_addr to_ip,char *master,char *rname)
+
+BOOL name_status_find(const char *q_name, int q_type, int type, struct in_addr to_ip, char *name)
 {
-       return internal_name_status(fd,name,name_type,recurse,
-                                   to_ip,master,rname,True,
-                                   _interpret_node_status);
+       struct node_status *status = NULL;
+       struct nmb_name nname;
+       int count, i;
+       int sock;
+       BOOL result = False;
+
+       DEBUG(10, ("name_status_find: looking up %s#%02x at %s\n", q_name, 
+                  q_type, inet_ntoa(to_ip)));
+
+       sock = open_socket_in(SOCK_DGRAM, 0, 3, interpret_addr(lp_socket_address()), True);
+       if (sock == -1)
+               goto done;
+
+       /* W2K PDC's seem not to respond to '*'#0. JRA */
+       make_nmb_name(&nname, q_name, q_type);
+       status = node_status_query(sock, &nname, to_ip, &count);
+       close(sock);
+       if (!status)
+               goto done;
+
+       for (i=0;i<count;i++) {
+               if (status[i].type == type)
+                       break;
+       }
+       if (i == count)
+               goto done;
+
+       pull_ascii(name, status[i].name, 15, -1, STR_TERMINATE);
+       result = True;
+
+ done:
+       SAFE_FREE(status);
+
+       DEBUG(10, ("name_status_find: name %sfound", result ? "" : "not "));
+
+       if (result)
+               DEBUGADD(10, (", ip address is %s", inet_ntoa(to_ip)));
+
+       DEBUG(10, ("\n"));      
+
+       return result;
 }
 
+
+/*
+  comparison function used by sort_ip_list
+*/
+static int ip_compare(struct in_addr *ip1, struct in_addr *ip2)
+{
+       int max_bits1=0, max_bits2=0;
+       int num_interfaces = iface_count();
+       int i;
+
+       for (i=0;i<num_interfaces;i++) {
+               struct in_addr ip;
+               int bits1, bits2;
+               ip = *iface_n_bcast(i);
+               bits1 = matching_quad_bits((uchar *)&ip1->s_addr, (uchar *)&ip.s_addr);
+               bits2 = matching_quad_bits((uchar *)&ip2->s_addr, (uchar *)&ip.s_addr);
+               max_bits1 = MAX(bits1, max_bits1);
+               max_bits2 = MAX(bits2, max_bits2);
+       }       
+       
+       /* bias towards directly reachable IPs */
+       if (iface_local(*ip1)) {
+               max_bits1 += 32;
+       }
+       if (iface_local(*ip2)) {
+               max_bits2 += 32;
+       }
+
+       return max_bits2 - max_bits1;
+}
+
+/*
+  sort an IP list so that names that are close to one of our interfaces 
+  are at the top. This prevents the problem where a WINS server returns an IP that
+  is not reachable from our subnet as the first match
+*/
+static void sort_ip_list(struct in_addr *iplist, int count)
+{
+       if (count <= 1) {
+               return;
+       }
+
+       qsort(iplist, count, sizeof(struct in_addr), QSORT_CAST ip_compare);    
+}
+
+
 /****************************************************************************
  Do a netbios name query to find someones IP.
  Returns an array of IP addresses or NULL if none.
  *count will be set to the number of addresses returned.
+ *timed_out is set if we failed by timing out
 ****************************************************************************/
-
 struct in_addr *name_query(int fd,const char *name,int name_type, 
                           BOOL bcast,BOOL recurse,
-                          struct in_addr to_ip, int *count)
+                          struct in_addr to_ip, int *count, int *flags,
+                          BOOL *timed_out)
 {
-  BOOL found=False;
-  int i, retries = 3;
-  int retry_time = bcast?250:2000;
-  struct timeval tval;
-  struct packet_struct p;
-  struct packet_struct *p2;
-  struct nmb_packet *nmb = &p.packet.nmb;
-  struct in_addr *ip_list = NULL;
-
-  memset((char *)&p,'\0',sizeof(p));
-  (*count) = 0;
-
-  nmb->header.name_trn_id = generate_trn_id();
-  nmb->header.opcode = 0;
-  nmb->header.response = False;
-  nmb->header.nm_flags.bcast = bcast;
-  nmb->header.nm_flags.recursion_available = False;
-  nmb->header.nm_flags.recursion_desired = recurse;
-  nmb->header.nm_flags.trunc = False;
-  nmb->header.nm_flags.authoritative = False;
-  nmb->header.rcode = 0;
-  nmb->header.qdcount = 1;
-  nmb->header.ancount = 0;
-  nmb->header.nscount = 0;
-  nmb->header.arcount = 0;
-
-  make_nmb_name(&nmb->question.question_name,name,name_type);
-
-  nmb->question.question_type = 0x20;
-  nmb->question.question_class = 0x1;
-
-  p.ip = to_ip;
-  p.port = NMB_PORT;
-  p.fd = fd;
-  p.timestamp = time(NULL);
-  p.packet_type = NMB_PACKET;
-
-  GetTimeOfDay(&tval);
-
-  if (!send_packet(&p)) 
-    return NULL;
-
-  retries--;
-
-  while (1)
-  {
-         struct timeval tval2;
-         GetTimeOfDay(&tval2);
-         if (TvalDiff(&tval,&tval2) > retry_time) {
-                 if (!retries)
-                         break;
-                 if (!found && !send_packet(&p))
-                         return NULL;
-                 GetTimeOfDay(&tval);
-                 retries--;
-         }
-         
-         if ((p2=receive_nmb_packet(fd,90,nmb->header.name_trn_id))) {     
-                 struct nmb_packet *nmb2 = &p2->packet.nmb;
-                 debug_nmb_packet(p2);
-                 
-                 if (nmb2->header.opcode != 0 ||
-                     nmb2->header.nm_flags.bcast ||
-                     nmb2->header.rcode ||
-                     !nmb2->header.ancount) {
-                         /* 
-                          * XXXX what do we do with this? Could be a
-                          * redirect, but we'll discard it for the
-                          * moment.  */
-                         free_packet(p2);
-                         continue;
-                 }
+       BOOL found=False;
+       int i, retries = 3;
+       int retry_time = bcast?250:2000;
+       struct timeval tval;
+       struct packet_struct p;
+       struct packet_struct *p2;
+       struct nmb_packet *nmb = &p.packet.nmb;
+       struct in_addr *ip_list = NULL;
 
-                 ip_list = (struct in_addr *)Realloc(ip_list, sizeof(ip_list[0]) * 
-                                                     ((*count)+nmb2->answers->rdlength/6));
-                 if (ip_list) {
-                         DEBUG(2,("Got a positive name query response from %s ( ",
-                                  inet_ntoa(p2->ip)));
-                         for (i=0;i<nmb2->answers->rdlength/6;i++) {
-                                 putip((char *)&ip_list[(*count)],&nmb2->answers->rdata[2+i*6]);
-                                 DEBUG(2,("%s ",inet_ntoa(ip_list[(*count)])));
-                                 (*count)++;
-                         }
-                         DEBUG(2,(")\n"));
-                 }
+       if (timed_out) {
+               *timed_out = False;
+       }
+       
+       memset((char *)&p,'\0',sizeof(p));
+       (*count) = 0;
+       (*flags) = 0;
+       
+       nmb->header.name_trn_id = generate_trn_id();
+       nmb->header.opcode = 0;
+       nmb->header.response = False;
+       nmb->header.nm_flags.bcast = bcast;
+       nmb->header.nm_flags.recursion_available = False;
+       nmb->header.nm_flags.recursion_desired = recurse;
+       nmb->header.nm_flags.trunc = False;
+       nmb->header.nm_flags.authoritative = False;
+       nmb->header.rcode = 0;
+       nmb->header.qdcount = 1;
+       nmb->header.ancount = 0;
+       nmb->header.nscount = 0;
+       nmb->header.arcount = 0;
+       
+       make_nmb_name(&nmb->question.question_name,name,name_type);
+       
+       nmb->question.question_type = 0x20;
+       nmb->question.question_class = 0x1;
+       
+       p.ip = to_ip;
+       p.port = NMB_PORT;
+       p.fd = fd;
+       p.timestamp = time(NULL);
+       p.packet_type = NMB_PACKET;
+       
+       GetTimeOfDay(&tval);
+       
+       if (!send_packet(&p)) 
+               return NULL;
+       
+       retries--;
+       
+       while (1) {
+               struct timeval tval2;
+               struct in_addr *tmp_ip_list;
+               
+               GetTimeOfDay(&tval2);
+               if (TvalDiff(&tval,&tval2) > retry_time) {
+                       if (!retries)
+                               break;
+                       if (!found && !send_packet(&p))
+                               return NULL;
+                       GetTimeOfDay(&tval);
+                       retries--;
+               }
+               
+               if ((p2=receive_nmb_packet(fd,90,nmb->header.name_trn_id))) {     
+                       struct nmb_packet *nmb2 = &p2->packet.nmb;
+                       debug_nmb_packet(p2);
+                       
+                       /* If we get a Negative Name Query Response from a WINS
+                        * server, we should report it and give up.
+                        */
+                       if( 0 == nmb2->header.opcode            /* A query response   */
+                           && !(bcast)                 /* from a WINS server */
+                           && nmb2->header.rcode               /* Error returned     */
+                               ) {
+                               
+                               if( DEBUGLVL( 3 ) ) {
+                                       /* Only executed if DEBUGLEVEL >= 3 */
+                                       dbgtext( "Negative name query response, rcode 0x%02x: ", nmb2->header.rcode );
+                                       switch( nmb2->header.rcode ) {
+                                       case 0x01:
+                                               dbgtext( "Request was invalidly formatted.\n" );
+                                               break;
+                                       case 0x02:
+                                               dbgtext( "Problem with NBNS, cannot process name.\n");
+                                               break;
+                                       case 0x03:
+                                               dbgtext( "The name requested does not exist.\n" );
+                                               break;
+                                       case 0x04:
+                                               dbgtext( "Unsupported request error.\n" );
+                                               break;
+                                       case 0x05:
+                                               dbgtext( "Query refused error.\n" );
+                                               break;
+                                       default:
+                                               dbgtext( "Unrecognized error code.\n" );
+                                               break;
+                                       }
+                               }
+                               free_packet(p2);
+                               return( NULL );
+                       }
+                       
+                       if (nmb2->header.opcode != 0 ||
+                           nmb2->header.nm_flags.bcast ||
+                           nmb2->header.rcode ||
+                           !nmb2->header.ancount) {
+                               /* 
+                                * XXXX what do we do with this? Could be a
+                                * redirect, but we'll discard it for the
+                                * moment.
+                                */
+                               free_packet(p2);
+                               continue;
+                       }
+                       
+                       tmp_ip_list = (struct in_addr *)Realloc( ip_list, sizeof( ip_list[0] )
+                                                                * ( (*count) + nmb2->answers->rdlength/6 ) );
+                       
+                       if (!tmp_ip_list) {
+                               DEBUG(0,("name_query: Realloc failed.\n"));
+                               SAFE_FREE(ip_list);
+                       }
+                       
+                       ip_list = tmp_ip_list;
+                       
+                       if (ip_list) {
+                               DEBUG(2,("Got a positive name query response from %s ( ", inet_ntoa(p2->ip)));
+                               for (i=0;i<nmb2->answers->rdlength/6;i++) {
+                                       putip((char *)&ip_list[(*count)],&nmb2->answers->rdata[2+i*6]);
+                                       DEBUGADD(2,("%s ",inet_ntoa(ip_list[(*count)])));
+                                       (*count)++;
+                               }
+                               DEBUGADD(2,(")\n"));
+                       }
+                       
+                       found=True;
+                       retries=0;
+                       /* We add the flags back ... */
+                       if (nmb2->header.response)
+                               (*flags) |= NM_FLAGS_RS;
+                       if (nmb2->header.nm_flags.authoritative)
+                               (*flags) |= NM_FLAGS_AA;
+                       if (nmb2->header.nm_flags.trunc)
+                               (*flags) |= NM_FLAGS_TC;
+                       if (nmb2->header.nm_flags.recursion_desired)
+                               (*flags) |= NM_FLAGS_RD;
+                       if (nmb2->header.nm_flags.recursion_available)
+                               (*flags) |= NM_FLAGS_RA;
+                       if (nmb2->header.nm_flags.bcast)
+                               (*flags) |= NM_FLAGS_B;
+                       free_packet(p2);
+                       /*
+                        * If we're doing a unicast lookup we only
+                        * expect one reply. Don't wait the full 2
+                        * seconds if we got one. JRA.
+                        */
+                       if(!bcast && found)
+                               break;
+               }
+       }
 
-                 found=True;
-                 retries=0;
-                 free_packet(p2);
-                 /*
-                  * If we're doing a unicast lookup we only
-                  * expect one reply. Don't wait the full 2
-                  * seconds if we got one. JRA.
-                  */
-                 if(!bcast && found)
-                         break;
-         }
-  }
+       if (timed_out) {
+               *timed_out = True;
+       }
 
-  return ip_list;
+       /* sort the ip list so we choose close servers first if possible */
+       sort_ip_list(ip_list, *count);
+
+       return ip_list;
 }
 
 /********************************************************
  Start parsing the lmhosts file.
 *********************************************************/
 
-FILE *startlmhosts(char *fname)
+XFILE *startlmhosts(char *fname)
 {
-  FILE *fp = sys_fopen(fname,"r");
-  if (!fp) {
-    DEBUG(4,("startlmhosts: Can't open lmhosts file %s. Error was %s\n",
-             fname, strerror(errno)));
-    return NULL;
-  }
-  return fp;
+       XFILE *fp = x_fopen(fname,O_RDONLY, 0);
+       if (!fp) {
+               DEBUG(4,("startlmhosts: Can't open lmhosts file %s. Error was %s\n",
+                        fname, strerror(errno)));
+               return NULL;
+       }
+       return fp;
 }
 
 /********************************************************
  Parse the next line in the lmhosts file.
 *********************************************************/
 
-BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr)
+BOOL getlmhostsent( XFILE *fp, pstring name, int *name_type, struct in_addr *ipaddr)
 {
   pstring line;
 
-  while(!feof(fp) && !ferror(fp)) {
+  while(!x_feof(fp) && !x_ferror(fp)) {
     pstring ip,flags,extra;
     char *ptr;
     int count = 0;
@@ -381,7 +504,7 @@ BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipad
 
     DEBUG(4, ("getlmhostsent: lmhost entry: %s %s %s\n", ip, name, flags));
 
-    if (strchr(flags,'G') || strchr(flags,'S'))
+    if (strchr_m(flags,'G') || strchr_m(flags,'S'))
     {
       DEBUG(0,("getlmhostsent: group flag in lmhosts ignored (obsolete)\n"));
       continue;
@@ -391,7 +514,7 @@ BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipad
 
     /* Extra feature. If the name ends in '#XX', where XX is a hex number,
        then only add that name type. */
-    if((ptr = strchr(name, '#')) != NULL)
+    if((ptr = strchr_m(name, '#')) != NULL)
     {
       char *endptr;
 
@@ -417,17 +540,18 @@ BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipad
  Finish parsing the lmhosts file.
 *********************************************************/
 
-void endlmhosts(FILE *fp)
+void endlmhosts(XFILE *fp)
 {
-  fclose(fp);
+       x_fclose(fp);
 }
 
+
 /********************************************************
  Resolve via "bcast" method.
 *********************************************************/
 
-static BOOL resolve_bcast(const char *name, int name_type,
-                               struct in_addr **return_ip_list, int *return_count)
+BOOL name_resolve_bcast(const char *name, int name_type,
+                       struct in_addr **return_ip_list, int *return_count)
 {
        int sock, i;
        int num_interfaces = iface_count();
@@ -439,7 +563,7 @@ static BOOL resolve_bcast(const char *name, int name_type,
         * "bcast" means do a broadcast lookup on all the local interfaces.
         */
 
-       DEBUG(3,("resolve_bcast: Attempting broadcast lookup for name %s<0x%x>\n", name, name_type));
+       DEBUG(3,("name_resolve_bcast: Attempting broadcast lookup for name %s<0x%x>\n", name, name_type));
 
        sock = open_socket_in( SOCK_DGRAM, 0, 3,
                               interpret_addr(lp_socket_address()), True );
@@ -453,10 +577,11 @@ static BOOL resolve_bcast(const char *name, int name_type,
         */
        for( i = num_interfaces-1; i >= 0; i--) {
                struct in_addr sendto_ip;
+               int flags;
                /* Done this way to fix compiler error on IRIX 5.x */
-               sendto_ip = *iface_bcast(*iface_n_ip(i));
+               sendto_ip = *iface_n_bcast(i);
                *return_ip_list = name_query(sock, name, name_type, True, 
-                                   True, sendto_ip, return_count);
+                                   True, sendto_ip, return_count, &flags, NULL);
                if(*return_ip_list != NULL) {
                        close(sock);
                        return True;
@@ -470,51 +595,88 @@ static BOOL resolve_bcast(const char *name, int name_type,
 /********************************************************
  Resolve via "wins" method.
 *********************************************************/
-
-static BOOL resolve_wins(const char *name, int name_type,
-                         struct in_addr **return_iplist, int *return_count)
+BOOL resolve_wins(const char *name, int name_type,
+                 struct in_addr **return_iplist, int *return_count)
 {
-       int sock;
-       struct in_addr wins_ip;
-       BOOL wins_ismyip;
+       int sock, t, i;
+       char **wins_tags;
+       struct in_addr src_ip;
 
        *return_iplist = NULL;
        *return_count = 0;
        
-       /*
-        * "wins" means do a unicast lookup to the WINS server.
-        * Ignore if there is no WINS server specified or if the
-        * WINS server is one of our interfaces (if we're being
-        * called from within nmbd - we can't do this call as we
-        * would then block).
-        */
-
        DEBUG(3,("resolve_wins: Attempting wins lookup for name %s<0x%x>\n", name, name_type));
 
-       if(!*lp_wins_server()) {
-               DEBUG(3,("resolve_wins: WINS server resolution selected and no WINS server present.\n"));
+       if (wins_srv_count() < 1) {
+               DEBUG(3,("resolve_wins: WINS server resolution selected and no WINS servers listed.\n"));
                return False;
        }
 
-       wins_ip = *interpret_addr2(lp_wins_server());
-       wins_ismyip = ismyip(wins_ip);
-
-       if((wins_ismyip && !global_in_nmbd) || !wins_ismyip) {
-               sock = open_socket_in( SOCK_DGRAM, 0, 3,
-                                                       interpret_addr(lp_socket_address()), True );
-             
-               if (sock != -1) {
-                       *return_iplist = name_query(sock, name, name_type, False, 
-                                                               True, wins_ip, return_count);
-                       if(*return_iplist != NULL) {
-                               close(sock);
-                               return True;
+       /* we try a lookup on each of the WINS tags in turn */
+       wins_tags = wins_srv_tags();
+
+       if (!wins_tags) {
+               /* huh? no tags?? give up in disgust */
+               return False;
+       }
+
+       /* the address we will be sending from */
+       src_ip = *interpret_addr2(lp_socket_address());
+
+       /* in the worst case we will try every wins server with every
+          tag! */
+       for (t=0; wins_tags && wins_tags[t]; t++) {
+               int srv_count = wins_srv_count_tag(wins_tags[t]);
+               for (i=0; i<srv_count; i++) {
+                       struct in_addr wins_ip;
+                       int flags;
+                       BOOL timed_out;
+
+                       wins_ip = wins_srv_ip_tag(wins_tags[t], src_ip);
+
+                       if (global_in_nmbd && ismyip(wins_ip)) {
+                               /* yikes! we'll loop forever */
+                               continue;
+                       }
+
+                       /* skip any that have been unresponsive lately */
+                       if (wins_srv_is_dead(wins_ip, src_ip)) {
+                               continue;
+                       }
+
+                       DEBUG(3,("resolve_wins: using WINS server %s and tag '%s'\n", inet_ntoa(wins_ip), wins_tags[t]));
+
+                       sock = open_socket_in(SOCK_DGRAM, 0, 3, src_ip.s_addr, True);
+                       if (sock == -1) {
+                               continue;
+                       }
+
+                       *return_iplist = name_query(sock,name,name_type, False, 
+                                                   True, wins_ip, return_count, &flags, 
+                                                   &timed_out);
+                       if (*return_iplist != NULL) {
+                               goto success;
                        }
                        close(sock);
+
+                       if (timed_out) {
+                               /* Timed out wating for WINS server to respond.  Mark it dead. */
+                               wins_srv_died(wins_ip, src_ip);
+                       } else {
+                               /* The name definately isn't in this
+                                  group of WINS servers. goto the next group  */
+                               break;
+                       }
                }
        }
 
+       wins_srv_tags_free(wins_tags);
        return False;
+
+success:
+       wins_srv_tags_free(wins_tags);
+       close(sock);
+       return True;
 }
 
 /********************************************************
@@ -528,7 +690,7 @@ static BOOL resolve_lmhosts(const char *name, int name_type,
         * "lmhosts" means parse the local lmhosts file.
         */
        
-       FILE *fp;
+       XFILE *fp;
        pstring lmhost_name;
        int name_type2;
        struct in_addr return_ip;
@@ -538,7 +700,7 @@ static BOOL resolve_lmhosts(const char *name, int name_type,
 
        DEBUG(3,("resolve_lmhosts: Attempting lmhosts lookup for name %s<0x%x>\n", name, name_type));
 
-       fp = startlmhosts( LMHOSTSFILE );
+       fp = startlmhosts(dyn_LMHOSTSFILE);
        if(fp) {
                while (getlmhostsent(fp, lmhost_name, &name_type2, &return_ip)) {
                        if (strequal(name, lmhost_name) && 
@@ -578,7 +740,7 @@ static BOOL resolve_hosts(const char *name,
 
        DEBUG(3,("resolve_hosts: Attempting host lookup for name %s<0x20>\n", name));
        
-       if (((hp = Get_Hostbyname(name)) != NULL) && (hp->h_addr != NULL)) {
+       if (((hp = sys_gethostbyname(name)) != NULL) && (hp->h_addr != NULL)) {
                struct in_addr return_ip;
                putip((char *)&return_ip,(char *)hp->h_addr);
                *return_iplist = (struct in_addr *)malloc(sizeof(struct in_addr));
@@ -609,9 +771,15 @@ static BOOL internal_resolve_name(const char *name, int name_type,
   BOOL allones = (strcmp(name,"255.255.255.255") == 0);
   BOOL allzeros = (strcmp(name,"0.0.0.0") == 0);
   BOOL is_address = is_ipaddress(name);
+  BOOL result = False;
+  struct in_addr *nodupes_iplist;
+  int i;
+
   *return_iplist = NULL;
   *return_count = 0;
 
+  DEBUG(10, ("internal_resolve_name: looking up %s#%x\n", name, name_type));
+
   if (allzeros || allones || is_address) {
        *return_iplist = (struct in_addr *)malloc(sizeof(struct in_addr));
        if(*return_iplist == NULL) {
@@ -636,32 +804,91 @@ static BOOL internal_resolve_name(const char *name, int name_type,
   while (next_token(&ptr, tok, LIST_SEP, sizeof(tok))) {
          if((strequal(tok, "host") || strequal(tok, "hosts"))) {
                  if (name_type == 0x20 && resolve_hosts(name, return_iplist, return_count)) {
-                         return True;
+                   result = True;
+                   goto done;
                  }
          } else if(strequal( tok, "lmhosts")) {
                  if (resolve_lmhosts(name, name_type, return_iplist, return_count)) {
-                         return True;
+                   result = True;
+                   goto done;
                  }
          } else if(strequal( tok, "wins")) {
                  /* don't resolve 1D via WINS */
                  if (name_type != 0x1D &&
                      resolve_wins(name, name_type, return_iplist, return_count)) {
-                         return True;
+                   result = True;
+                   goto done;
                  }
          } else if(strequal( tok, "bcast")) {
-                 if (resolve_bcast(name, name_type, return_iplist, return_count)) {
-                         return True;
+                 if (name_resolve_bcast(name, name_type, return_iplist, return_count)) {
+                   result = True;
+                   goto done;
                  }
          } else {
                  DEBUG(0,("resolve_name: unknown name switch type %s\n", tok));
          }
   }
 
-  if((*return_iplist) != NULL) {
-    free((char *)(*return_iplist));
-    *return_iplist = NULL;
-  }
+  /* All of the resolve_* functions above have returned false. */
+
+  SAFE_FREE(*return_iplist);
+  *return_count = 0;
+
   return False;
+
+ done:
+
+  /* Remove duplicate entries.  Some queries, notably #1c (domain
+     controllers) return the PDC in iplist[0] and then all domain
+     controllers including the PDC in iplist[1..n].  Iterating over
+     the iplist when the PDC is down will cause two sets of timeouts. */
+
+  if (*return_count && (nodupes_iplist = (struct in_addr *)
+       malloc(sizeof(struct in_addr) * (*return_count)))) {
+         int nodupes_count = 0;
+
+         /* Iterate over return_iplist looking for duplicates */
+
+         for (i = 0; i < *return_count; i++) {
+                 BOOL is_dupe = False;
+                 int j;
+
+                 for (j = i + 1; j < *return_count; j++) {
+                         if (ip_equal((*return_iplist)[i], 
+                                      (*return_iplist)[j])) {
+                                 is_dupe = True;
+                                 break;
+                         }
+                 }
+
+                 if (!is_dupe) {
+
+                         /* This one not a duplicate */
+
+                         nodupes_iplist[nodupes_count] = (*return_iplist)[i];
+                         nodupes_count++;
+                 }
+         }
+         
+         /* Switcheroo with original list */
+         
+         free(*return_iplist);
+
+         *return_iplist = nodupes_iplist;
+         *return_count = nodupes_count;
+  }
+
+  /* Display some debugging info */
+
+  DEBUG(10, ("internal_resolve_name: returning %d addresses: ", 
+            *return_count));
+
+  for (i = 0; i < *return_count; i++)
+         DEBUGADD(10, ("%s ", inet_ntoa((*return_iplist)[i])));
+
+  DEBUG(10, ("\n"));
+
+  return result;
 }
 
 /********************************************************
@@ -676,13 +903,26 @@ BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type)
        struct in_addr *ip_list = NULL;
        int count = 0;
 
-       if(internal_resolve_name(name, name_type, &ip_list, &count)) {
-               *return_ip = ip_list[0];
-               free((char *)ip_list);
+       if (is_ipaddress(name)) {
+               *return_ip = *interpret_addr2(name);
                return True;
        }
-       if(ip_list != NULL)
-               free((char *)ip_list);
+
+       if (internal_resolve_name(name, name_type, &ip_list, &count)) {
+               int i;
+               /* only return valid addresses for TCP connections */
+               for (i=0; i<count; i++) {
+                       char *ip_str = inet_ntoa(ip_list[i]);
+                       if (ip_str &&
+                           strcmp(ip_str, "255.255.255.255") != 0 &&
+                           strcmp(ip_str, "0.0.0.0") != 0) {
+                               *return_ip = ip_list[i];
+                               SAFE_FREE(ip_list);
+                               return True;
+                       }
+               }
+       }
+       SAFE_FREE(ip_list);
        return False;
 }
 
@@ -697,26 +937,52 @@ BOOL find_master_ip(char *group, struct in_addr *master_ip)
 
        if (internal_resolve_name(group, 0x1D, &ip_list, &count)) {
                *master_ip = ip_list[0];
-               free((char *)ip_list);
+               SAFE_FREE(ip_list);
                return True;
        }
        if(internal_resolve_name(group, 0x1B, &ip_list, &count)) {
                *master_ip = ip_list[0];
-               free((char *)ip_list);
+               SAFE_FREE(ip_list);
                return True;
        }
 
-       if(ip_list != NULL)
-               free((char *)ip_list);
+       SAFE_FREE(ip_list);
        return False;
 }
 
-
 /********************************************************
- Lookup a PDC name given a Domain name and IP address.
+ Lookup a DC name given a Domain name and IP address.
 *********************************************************/
-BOOL lookup_pdc_name(const char *srcname, const char *domain, struct in_addr *pdc_ip, char *ret_name)
+
+BOOL lookup_dc_name(const char *srcname, const char *domain, 
+                   struct in_addr *dc_ip, char *ret_name)
 {
+#if !defined(I_HATE_WINDOWS_REPLY_CODE)
+       
+       fstring dc_name;
+       BOOL ret;
+       
+       /*
+        * Due to the fact win WinNT *sucks* we must do a node status
+        * query here... JRA.
+        */
+       
+       *dc_name = '\0';
+       
+       ret = name_status_find(domain, 0x1c, 0x20, *dc_ip, dc_name);
+
+       if(ret && *dc_name) {
+               fstrcpy(ret_name, dc_name);
+               return True;
+       }
+       
+       return False;
+
+#else /* defined(I_HATE_WINDOWS_REPLY_CODE) */
+
+JRA - This code is broken with BDC rollover - we need to do a full
+NT GETDC call, UNICODE, NT domain SID and uncle tom cobbley and all...
+
        int retries = 3;
        int retry_time = 2000;
        struct timeval tval;
@@ -727,7 +993,7 @@ BOOL lookup_pdc_name(const char *srcname, const char *domain, struct in_addr *pd
        int len;
        struct sockaddr_in sock_name;
        int sock_len = sizeof(sock_name);
-       const char *mailslot = "\\MAILSLOT\\NET\\NETLOGON";
+       const char *mailslot = NET_LOGON_MAILSLOT;
        char *mailslot_name;
        char buffer[1024];
        char *bufp;
@@ -755,11 +1021,12 @@ BOOL lookup_pdc_name(const char *srcname, const char *domain, struct in_addr *pd
        bufp += 2;
        fstrcpy(bufp,srcname);
        bufp += (strlen(bufp) + 1);
-       slprintf(bufp, sizeof(fstring), "\\MAILSLOT\\NET\\GETDC%d", dgm_id);
+       slprintf(bufp, sizeof(fstring)-1, "\\MAILSLOT\\NET\\GETDC%d", dgm_id);
        mailslot_name = bufp;
        bufp += (strlen(bufp) + 1);
-       bufp = align2(bufp, buffer);
-       bufp += dos_PutUniCode(bufp, srcname, sizeof(buffer) - (bufp - buffer) - 1, True);
+       bufp = ALIGN2(bufp, buffer);
+       bufp += push_ucs2(NULL, bufp, srcname, sizeof(buffer) - (bufp - buffer), STR_TERMINATE);        
+       
        SIVAL(bufp,0,1);
        SSVAL(bufp,4,0xFFFF); 
        SSVAL(bufp,6,0xFFFF); 
@@ -780,7 +1047,7 @@ BOOL lookup_pdc_name(const char *srcname, const char *domain, struct in_addr *pd
        dgram->header.packet_offset = 0;
        
        make_nmb_name(&dgram->source_name,srcname,0);
-       make_nmb_name(&dgram->dest_name,domain,0x1B);
+       make_nmb_name(&dgram->dest_name,domain,0x1C);
        
        ptr = &dgram->data[0];
        
@@ -887,13 +1154,57 @@ BOOL lookup_pdc_name(const char *srcname, const char *domain, struct in_addr *pd
        
        close(sock);
        return False;
+#endif /* defined(I_HATE_WINDOWS_REPLY_CODE) */
 }
 
 
 /********************************************************
  Get the IP address list of the PDC/BDC's of a Domain.
 *********************************************************/
-BOOL get_dc_list(char *group, struct in_addr **ip_list, int *count)
+
+BOOL get_dc_list(BOOL pdc_only, const char *group, struct in_addr **ip_list, int *count)
 {
-       return internal_resolve_name(group, 0x1C, ip_list, count);
+       int name_type = pdc_only ? 0x1B : 0x1C;
+
+       /*
+        * If it's our domain then
+        * use the 'password server' parameter.
+        */
+
+       if (strequal(group, lp_workgroup())) {
+               char *p;
+               char *pserver = lp_passwordserver();
+               fstring name;
+               int num_adresses = 0;
+               struct in_addr *return_iplist = NULL;
+
+               if (! *pserver)
+                       return internal_resolve_name(group, name_type, ip_list, count);
+
+               p = pserver;
+               while (next_token(&p,name,LIST_SEP,sizeof(name))) {
+                       if (strequal(name, "*"))
+                               return internal_resolve_name(group, name_type, ip_list, count);
+                       num_adresses++;
+               }
+               if (num_adresses == 0)
+                       return internal_resolve_name(group, name_type, ip_list, count);
+
+               return_iplist = (struct in_addr *)malloc(num_adresses * sizeof(struct in_addr));
+               if(return_iplist == NULL) {
+                       DEBUG(3,("get_dc_list: malloc fail !\n"));
+                       return False;
+               }
+               p = pserver;
+               *count = 0;
+               while (next_token(&p,name,LIST_SEP,sizeof(name))) {
+                       struct in_addr name_ip;
+                       if (resolve_name( name, &name_ip, 0x20) == False)
+                               continue;
+                       return_iplist[(*count)++] = name_ip;
+               }
+               *ip_list = return_iplist;
+               return (*count != 0);
+       } else
+               return internal_resolve_name(group, name_type, ip_list, count);
 }