Modified fix for bugid #784. Based on a patch from moriyama@miraclelinux.com (MORIYAM...
[samba.git] / source3 / libsmb / namequery.c
index 0d9cc54f2132867da0e0f802e33fca871fa92bcc..b9bc4e11664da2b06f8eb8f7a6b6fe996a0cbf4a 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
    
 
 #include "includes.h"
 
-extern pstring scope;
-extern pstring global_myname;
-extern int DEBUGLEVEL;
-
 /* nmbd.c sets this to True. */
 BOOL global_in_nmbd = False;
 
-  static int name_trn_id = 0;
-
 /****************************************************************************
-interpret a node status response
+ Generate a random trn_id.
 ****************************************************************************/
-static void _interpret_node_status(char *p, char *master,char *rname)
+
+static int generate_trn_id(void)
 {
-  int numnames = CVAL(p,0);
-  DEBUG(1,("received %d names\n",numnames));
+       static int trn_id;
 
-  if (rname) *rname = 0;
-  if (master) *master = 0;
+       if (trn_id == 0) {
+               sys_srandom(sys_getpid());
+       }
 
-  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," ");
-      }
+       trn_id = sys_random();
 
-      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;
-    }
-  DEBUG(1,("num_good_sends=%d num_good_receives=%d\n",
-              IVAL(p,20),IVAL(p,24)));
+       return trn_id % (unsigned)0x7FFF;
 }
 
-
 /****************************************************************************
-  do a netbios name status query on a host
+ Parse a node status response into an array of structures.
+****************************************************************************/
 
-  the "master" parameter is a hack used for finding workgroups.
-  **************************************************************************/
-BOOL name_status(int fd,char *name,int name_type,BOOL recurse,
-                struct in_addr to_ip,char *master,char *rname,
-                void (*fn)(struct packet_struct *))
+static struct node_status *parse_node_status(char *p, 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;
-       int packet_type = NMB_PACKET;
-
-       if (fd == -1)
-       {
-               retries = 1;
-               packet_type = NMB_SOCK_PACKET;
-               fd = get_nmb_sock();
-
-               if (fd < 0)
-               {
-                       return False;
-               }
+       struct node_status *ret;
+       int i;
+
+       *num_names = CVAL(p,0);
+
+       if (*num_names == 0)
+               return NULL;
+
+       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_char(ret[i].name,'\0',' ');
+               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));
        }
-  bzero((char *)&p,sizeof(p));
+       return ret;
+}
 
-  if (!name_trn_id) name_trn_id = ((unsigned)time(NULL)%(unsigned)0x7FFF) + 
-    ((unsigned)getpid()%(unsigned)100);
-  name_trn_id = (name_trn_id+1) % (unsigned)0x7FFF;
 
-  nmb->header.name_trn_id = name_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;
+/****************************************************************************
+ 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.
+**************************************************************************/
 
-  make_nmb_name(&nmb->question.question_name,name,name_type,scope);
+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 = 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;
 
-  nmb->question.question_type = 0x21;
-  nmb->question.question_class = 0x1;
+       retries--;
 
-  p.ip = to_ip;
-  p.port = NMB_PORT;
-  p.fd = fd;
-  p.timestamp = time(NULL);
-  p.packet_type = packet_type;
+       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--;
+               }
 
-  GetTimeOfDay(&tval);
+               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;
+                       }
 
-  if (!send_packet(&p)) 
-       {
-               if (packet_type == NMB_SOCK_PACKET) close(fd);
-    return(False);
+                       ret = parse_node_status(&nmb2->answers->rdata[0], num_names);
+                       free_packet(p2);
+                       return ret;
+               }
        }
+       
+       return NULL;
+}
 
-  retries--;
+/****************************************************************************
+ 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.
+**************************************************************************/
 
-  while (1)
-    {
-      struct timeval tval2;
-      GetTimeOfDay(&tval2);
-      if (TvalDiff(&tval,&tval2) > retry_time) {
-       if (!retries) break;
-       if (!found && !send_packet(&p))
-       {
-               if (packet_type == NMB_SOCK_PACKET) close(fd);
-         return False;
+BOOL name_status_find(const char *q_name, int q_type, int type, struct in_addr to_ip, fstring name)
+{
+       struct node_status *status = NULL;
+       struct nmb_name nname;
+       int count, i;
+       int sock;
+       BOOL result = False;
+
+       if (lp_disable_netbios()) {
+               DEBUG(5,("name_status_find(%s#%02x): netbios is disabled\n", q_name, q_type));
+               return False;
        }
-       GetTimeOfDay(&tval);
-       retries--;
-      }
 
-      if ((p2=receive_packet(fd,packet_type,90)))
-       {     
-         struct nmb_packet *nmb2 = &p2->packet.nmb;
-      debug_nmb_packet(p2);
-
-         if (nmb->header.name_trn_id != nmb2->header.name_trn_id ||
-             !nmb2->header.response) {
-           /* its not for us - maybe deal with it later */
-           if (fn) 
-             fn(p2);
-           else
-             free_packet(p2);
-           continue;
-         }
-         
-         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;
-         }
+       DEBUG(10, ("name_status_find: looking up %s#%02x at %s\n", q_name, 
+                  q_type, inet_ntoa(to_ip)));
+
+       /* Check the cache first. */
+
+       if (namecache_status_fetch(q_name, q_type, type, to_ip, name))
+               return True;
+
+       sock = open_socket_in(SOCK_DGRAM, 0, 3, interpret_addr(lp_socket_address()), True);
+       if (sock == -1)
+               goto done;
 
-         _interpret_node_status(&nmb2->answers->rdata[0], master,rname);
-         free_packet(p2);
-               if (packet_type == NMB_SOCK_PACKET) close(fd);
-         return(True);
+       /* 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_nstring(name, sizeof(fstring), status[i].name);
+
+       /* Store the result in the cache. */
+       /* but don't store an entry for 0x1c names here.  Here we have 
+          a single host and DOMAIN<0x1c> names should be a list of hosts */
+          
+       if ( q_type != 0x1c )
+               namecache_status_store(q_name, q_type, type, to_ip, name);
 
-  DEBUG(0,("No status response (this is not unusual)\n"));
+       result = True;
 
-if (packet_type == NMB_SOCK_PACKET) close(fd);
-  return(False);
+ done:
+       SAFE_FREE(status);
+
+       DEBUG(10, ("name_status_find: name %sfound", result ? "" : "not "));
+
+       if (result)
+               DEBUGADD(10, (", name %s ip address is %s", name, inet_ntoa(to_ip)));
+
+       DEBUG(10, ("\n"));      
+
+       return result;
 }
 
+/*
+  comparison function used by sort_ip_list
+*/
 
-/****************************************************************************
-  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
-  ****************************************************************************/
-struct in_addr *name_query(int fd,const char *name,int name_type, BOOL bcast,BOOL recurse,
-         struct in_addr to_ip, int *count, void (*fn)(struct packet_struct *))
+static int ip_compare(struct in_addr *ip1, struct in_addr *ip2)
 {
-  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;
-       BOOL packet_type = NMB_PACKET;
-
-       if (fd == -1)
-       {
-               retries = 0;
-               packet_type = NMB_SOCK_PACKET;
-               fd = get_nmb_sock();
-
-               if (fd < 0)
-               {
-                       return NULL;
-               }
+       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;
        }
 
-  bzero((char *)&p,sizeof(p));
-  (*count) = 0;
+       return max_bits2 - max_bits1;
+}
+
+/*******************************************************************
+ compare 2 ldap IPs by nearness to our interfaces - used in qsort
+*******************************************************************/
 
-  if (!name_trn_id) name_trn_id = ((unsigned)time(NULL)%(unsigned)0x7FFF) + 
-    ((unsigned)getpid()%(unsigned)100);
-  name_trn_id = (name_trn_id+1) % (unsigned)0x7FFF;
+static int ip_service_compare(struct ip_service *ip1, struct ip_service *ip2)
+{
+       int result;
+       
+       if ( (result = ip_compare(&ip1->ip, &ip2->ip)) != 0 )
+               return result;
+               
+       if ( ip1->port > ip2->port )
+               return 1;
+       
+       if ( ip1->port < ip2->port )
+               return -1;
+               
+       return 0;
+}
 
-  nmb->header.name_trn_id = name_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;
+/*
+  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
+*/
 
-  make_nmb_name(&nmb->question.question_name,name,name_type,scope);
+static void sort_ip_list(struct in_addr *iplist, int count)
+{
+       if (count <= 1) {
+               return;
+       }
 
-  nmb->question.question_type = 0x20;
-  nmb->question.question_class = 0x1;
+       qsort(iplist, count, sizeof(struct in_addr), QSORT_CAST ip_compare);    
+}
 
-  p.ip = to_ip;
-  p.port = NMB_PORT;
-  p.fd = fd;
-  p.timestamp = time(NULL);
-  p.packet_type = packet_type;
+static void sort_ip_list2(struct ip_service *iplist, int count)
+{
+       if (count <= 1) {
+               return;
+       }
 
-       ZERO_STRUCT(tval);
+       qsort(iplist, count, sizeof(struct ip_service), QSORT_CAST ip_service_compare); 
+}
 
-  while (retries >= 0)
-  {
-    struct timeval tval2;
+/**********************************************************************
+ Remove any duplicate address/port pairs in the list 
+ *********************************************************************/
 
-    GetTimeOfDay(&tval2);
-    if (TvalDiff(&tval,&tval2) > retry_time) 
-    {
-      if (!found && !send_packet(&p))
-       {
-               if (packet_type == NMB_SOCK_PACKET) close(fd);
-        return NULL;
+static int remove_duplicate_addrs2( struct ip_service *iplist, int count )
+{
+       int i, j;
+       
+       DEBUG(10,("remove_duplicate_addrs2: looking for duplicate address/port pairs\n"));
+       
+       /* one loop to remove duplicates */
+       for ( i=0; i<count; i++ ) {
+               if ( is_zero_ip(iplist[i].ip) )
+                       continue;
+                                       
+               for ( j=i+1; j<count; j++ ) {
+                       if ( ip_service_equal(iplist[i], iplist[j]) )
+                               zero_ip(&iplist[j].ip);
+               }
+       }
+                       
+       /* one loop to clean up any holes we left */
+       /* first ip should never be a zero_ip() */
+       for (i = 0; i<count; ) {
+               if ( is_zero_ip(iplist[i].ip) ) {
+                       if (i != count-1 )
+                               memmove(&iplist[i], &iplist[i+1], (count - i - 1)*sizeof(iplist[i]));
+                       count--;
+                       continue;
+               }
+               i++;
        }
-      GetTimeOfDay(&tval);
-    }
 
-    if ((p2=receive_packet(fd,packet_type,90)))
-    {     
-      struct nmb_packet *nmb2 = &p2->packet.nmb;
-      debug_nmb_packet(p2);
+       return count;
+}
 
-      if (nmb->header.name_trn_id != nmb2->header.name_trn_id ||
-          !nmb2->header.response)
-      {
-       DEBUG(10,("packet not for us (received %d, expected %d\n",
-      nmb2->header.name_trn_id, nmb->header.name_trn_id));
-        /* 
-         * Its not for us - maybe deal with it later 
-         * (put it on the queue?).
-         */
-        if (fn) 
-          fn(p2);
-        else
-          free_packet(p2);
-        continue;
-      }
-         
-       retries--;
+/****************************************************************************
+ 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
+****************************************************************************/
 
-      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;
-      }
+struct in_addr *name_query(int fd,const char *name,int name_type, 
+                          BOOL bcast,BOOL recurse,
+                          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;
+
+       if (lp_disable_netbios()) {
+               DEBUG(5,("name_query(%s#%02x): netbios is disabled\n", name, name_type));
+               return NULL;
+       }
 
-      ip_list = (struct in_addr *)Realloc(ip_list, sizeof(ip_list[0]) * 
-                                          ((*count)+nmb2->answers->rdlength/6));
-      if (ip_list)
-      {
-        DEBUG(fn?3: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(fn?3:2,("%s ",inet_ntoa(ip_list[(*count)])));
-          (*count)++;
-        }
-        DEBUG(fn?3: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 (fn)
-        break;
-
-      if(found)
-       {
-        DEBUG(10,("returning OK\n"));
-        break;
-        }
-    }
-  }
+       /* only set timed_out if we didn't fund what we where looking for*/
+       
+       if ( !found && timed_out ) {
+               *timed_out = True;
+       }
 
-       if (packet_type == NMB_SOCK_PACKET) close(fd);
-  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;
+    const char *ptr;
+    char *ptr1;
     int count = 0;
 
     *name_type = -1;
@@ -426,7 +597,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;
@@ -436,20 +607,20 @@ 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((ptr1 = strchr_m(name, '#')) != NULL)
     {
       char *endptr;
 
-      ptr++;
-      *name_type = (int)strtol(ptr, &endptr,0);
+      ptr1++;
+      *name_type = (int)strtol(ptr1, &endptr, 16);
 
-      if(!*ptr || (endptr == ptr))
+      if(!*ptr1 || (endptr == ptr1))
       {
         DEBUG(0,("getlmhostsent: invalid name %s containing '#'.\n", name));
         continue;
       }
 
-      *(--ptr) = '\0'; /* Truncate at the '#' */
+      *(--ptr1) = '\0'; /* Truncate at the '#' */
     }
 
     return True;
@@ -462,130 +633,236 @@ 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);
 }
 
+/********************************************************
+ convert an array if struct in_addrs to struct ip_service
+ return False on failure.  Port is set to PORT_NONE;
+*********************************************************/
 
+static BOOL convert_ip2service( struct ip_service **return_iplist, struct in_addr *ip_list, int count )
+{
+       int i;
+
+       if ( count==0 || !ip_list )
+               return False;
+               
+       /* copy the ip address; port will be PORT_NONE */
+       if ( (*return_iplist = (struct ip_service*)malloc(count*sizeof(struct ip_service))) == NULL ) {
+               DEBUG(0,("convert_ip2service: malloc failed for %d enetries!\n", count ));
+               return False;
+       }
+       
+       for ( i=0; i<count; i++ ) {
+               (*return_iplist)[i].ip   = ip_list[i];
+               (*return_iplist)[i].port = PORT_NONE;
+       }
 
+       return True;
+}      
 /********************************************************
-resolve via "bcast" method
+ Resolve via "bcast" method.
 *********************************************************/
-static BOOL resolve_bcast(const char *name, struct in_addr *return_ip, int name_type)
+
+BOOL name_resolve_bcast(const char *name, int name_type,
+                       struct ip_service **return_iplist, int *return_count)
 {
        int sock, i;
+       int num_interfaces = iface_count();
+       struct in_addr *ip_list;
+       BOOL ret;
+
+       if (lp_disable_netbios()) {
+               DEBUG(5,("name_resolve_bcast(%s#%02x): netbios is disabled\n", name, name_type));
+               return False;
+       }
+
+       *return_iplist = NULL;
+       *return_count = 0;
        
        /*
         * "bcast" means do a broadcast lookup on all the local interfaces.
         */
 
-       DEBUG(3,("resolve_name: Attempting broadcast lookup for name %s<0x20>\n", name));
+       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()) );
+                              interpret_addr(lp_socket_address()), True );
 
-       if (sock != -1) {
-               struct in_addr *iplist = NULL;
-               int count;
-               int num_interfaces = iface_count();
-               set_socket_options(sock,"SO_BROADCAST");
-               /*
-                * Lookup the name on all the interfaces, return on
-                * the first successful match.
-                */
-               for( i = 0; i < num_interfaces; i++) {
-                       struct in_addr sendto_ip;
-                       /* Done this way to fix compiler error on IRIX 5.x */
-                       sendto_ip = *iface_bcast(*iface_n_ip(i));
-                       iplist = name_query(sock, name, name_type, True, 
-                                           True, sendto_ip, &count, NULL);
-                       if(iplist != NULL) {
-                               *return_ip = iplist[0];
-                               free((char *)iplist);
-                               close(sock);
-                               return True;
-                       }
-               }
-               close(sock);
-       }
+       if (sock == -1) return False;
 
+       set_socket_options(sock,"SO_BROADCAST");
+       /*
+        * Lookup the name on all the interfaces, return on
+        * the first successful match.
+        */
+       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_n_bcast(i);
+               ip_list = name_query(sock, name, name_type, True, 
+                                   True, sendto_ip, return_count, &flags, NULL);
+               if( ip_list ) 
+                       goto success;
+       }
+       
+       /* failed - no response */
+       
+       close(sock);
        return False;
+       
+success:
+       ret = True;
+       if ( !convert_ip2service(return_iplist, ip_list, *return_count) )
+               ret = False;
+       
+       SAFE_FREE( ip_list );
+       close(sock);
+       return ret;
 }
 
-
-
 /********************************************************
-resolve via "wins" method
+ Resolve via "wins" method.
 *********************************************************/
-static BOOL resolve_wins(const char *name, struct in_addr *return_ip, int name_type)
+
+BOOL resolve_wins(const char *name, int name_type,
+                 struct ip_service **return_iplist, int *return_count)
 {
-      int sock;
-      struct in_addr wins_ip;
-      BOOL wins_ismyip;
-
-      /*
-       * "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_name: Attempting wins lookup for name %s<0x20>\n", name));
-
-      if(!*lp_wins_server()) {
-             DEBUG(3,("resolve_name: WINS server resolution selected and no WINS server present.\n"));
-             return False;
-      }
+       int sock, t, i;
+       char **wins_tags;
+       struct in_addr src_ip, *ip_list = NULL;
+       BOOL ret;
 
-      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()) );
-             
-             if (sock != -1) {
-                     struct in_addr *iplist = NULL;
-                     int count;
-                     iplist = name_query(sock, name, name_type, False, 
-                                         True, wins_ip, &count, NULL);
-                     if(iplist != NULL) {
-                             *return_ip = iplist[0];
-                             free((char *)iplist);
-                             close(sock);
-                             return True;
-                     }
-                     close(sock);
-             }
-      }
+       if (lp_disable_netbios()) {
+               DEBUG(5,("resolve_wins(%s#%02x): netbios is disabled\n", name, name_type));
+               return False;
+       }
 
-      return False;
-}
+       *return_iplist = NULL;
+       *return_count = 0;
+       
+       DEBUG(3,("resolve_wins: Attempting wins lookup for name %s<0x%x>\n", name, name_type));
+
+       if (wins_srv_count() < 1) {
+               DEBUG(3,("resolve_wins: WINS server resolution selected and no WINS servers listed.\n"));
+               return False;
+       }
+
+       /* 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;
+                       }
+
+                       ip_list = name_query(sock,name,name_type, False, 
+                                                   True, wins_ip, return_count, &flags, 
+                                                   &timed_out);
+                                                   
+                       /* exit loop if we got a list of addresses */
+                       
+                       if ( ip_list ) 
+                               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:
+       ret = True;
+       if ( !convert_ip2service( return_iplist, ip_list, *return_count ) )
+               ret = False;
+       
+       SAFE_FREE( ip_list );
+       wins_srv_tags_free(wins_tags);
+       close(sock);
+       
+       return ret;
+}
 
 /********************************************************
-resolve via "lmhosts" method
+ Resolve via "lmhosts" method.
 *********************************************************/
-static BOOL resolve_lmhosts(const char *name, struct in_addr *return_ip, int name_type)
+
+static BOOL resolve_lmhosts(const char *name, int name_type,
+                         struct ip_service **return_iplist, int *return_count)
 {
        /*
         * "lmhosts" means parse the local lmhosts file.
         */
        
-       FILE *fp;
+       XFILE *fp;
        pstring lmhost_name;
        int name_type2;
+       struct in_addr return_ip;
+
+       *return_iplist = NULL;
+       *return_count = 0;
 
-       DEBUG(3,("resolve_name: Attempting lmhosts lookup for name %s\n", name));
+       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)) {
+               while (getlmhostsent(fp, lmhost_name, &name_type2, &return_ip)) {
                        if (strequal(name, lmhost_name) && 
-                           name_type == name_type2) {
+                ((name_type2 == -1) || (name_type == name_type2))
+               ) {
                                endlmhosts(fp);
+                               if ( (*return_iplist = (struct ip_service *)malloc(sizeof(struct ip_service))) == NULL ) {
+                                       DEBUG(3,("resolve_lmhosts: malloc fail !\n"));
+                                       return False;
+                               }
+                               (*return_iplist)[0].ip   = return_ip;
+                               (*return_iplist)[0].port = PORT_NONE;
+                               *return_count = 1;
                                return True; 
                        }
                }
@@ -596,140 +873,534 @@ static BOOL resolve_lmhosts(const char *name, struct in_addr *return_ip, int nam
 
 
 /********************************************************
-resolve via "hosts" method
+ Resolve via "hosts" method.
 *********************************************************/
-static BOOL resolve_hosts(const char *name, struct in_addr *return_ip)
+
+static BOOL resolve_hosts(const char *name, int name_type,
+                         struct ip_service **return_iplist, int *return_count)
 {
        /*
         * "host" means do a localhost, or dns lookup.
         */
        struct hostent *hp;
+       
+       if ( name_type != 0x20 && name_type != 0x0) {
+               DEBUG(5, ("resolve_hosts: not appropriate for name type <0x%x>\n", name_type));
+               return False;
+       }
+
+       *return_iplist = NULL;
+       *return_count = 0;
 
-       DEBUG(3,("resolve_name: Attempting host lookup for name %s\n", name));
+       DEBUG(3,("resolve_hosts: Attempting host lookup for name %s<0x%x>\n", name, name_type));
        
-       if (((hp = Get_Hostbyname(name)) != NULL) && (hp->h_addr != NULL)) {
-               putip((char *)return_ip,(char *)hp->h_addr);
+       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 ip_service *)malloc(sizeof(struct ip_service));
+               if(*return_iplist == NULL) {
+                       DEBUG(3,("resolve_hosts: malloc fail !\n"));
+                       return False;
+               }
+               (*return_iplist)->ip   = return_ip;
+               (*return_iplist)->port = PORT_NONE;
+               *return_count = 1;
                return True;
        }
        return False;
 }
 
-
 /********************************************************
- Resolve a name into an IP address. Use this function if
- the string is either an IP address, DNS or host name
- or NetBIOS name. This uses the name switch in the
- smb.conf to determine the order of name resolution.
+ Resolve via "ADS" method.
 *********************************************************/
-BOOL is_ip_address(const char *name)
+
+static BOOL resolve_ads(const char *name, int name_type,
+                         struct ip_service **return_iplist, int *return_count)
 {
-  int i;
-  for (i=0; name[i]; i++)
-    if (!(isdigit((int)name[i]) || name[i] == '.'))
-       return False;
-   
-  return True;
+       
+#ifdef HAVE_ADS
+       if ( name_type == 0x1c ) {
+               int                     count, i = 0;
+               char                    *list = NULL;
+               const char              *ptr;
+               pstring                 tok;
+               
+               /* try to lookup the _ldap._tcp.<domain> if we are using ADS */
+               if ( lp_security() != SEC_ADS )
+                       return False;
+                       
+               DEBUG(5,("resolve_hosts: Attempting to resolve DC's for %s using DNS\n",
+                       name));
+                       
+               if (ldap_domain2hostlist(name, &list) != LDAP_SUCCESS)
+                       return False;
+                               
+               count = count_chars(list, ' ') + 1;
+               if ( (*return_iplist = malloc(count * sizeof(struct ip_service))) == NULL ) {
+                       DEBUG(0,("resolve_hosts: malloc failed for %d entries\n", count ));
+                       return False;
+               }
+
+               ptr = list;
+               while (next_token(&ptr, tok, " ", sizeof(tok))) {
+                       unsigned port = LDAP_PORT;      
+                       char *p = strchr(tok, ':');
+                       if (p) {
+                               *p = 0;
+                               port = atoi(p+1);
+                       }
+                       (*return_iplist)[i].ip   = *interpret_addr2(tok);
+                       (*return_iplist)[i].port = port;
+                       
+                       /* make sure it is a valid IP.  I considered checking the negative
+                          connection cache, but this is the wrong place for it.  Maybe only
+                          as a hac.  After think about it, if all of the IP addresses retuend
+                          from DNS are dead, what hope does a netbios name lookup have?
+                          The standard reason for falling back to netbios lookups is that 
+                          our DNS server doesn't know anything about the DC's   -- jerry */    
+                          
+                       if ( is_zero_ip((*return_iplist)[i].ip) )
+                               continue;
+               
+                       i++;
+               }
+               SAFE_FREE(list);
+               
+               *return_count = i;
+                               
+               return True;
+       } else 
+#endif         /* HAVE_ADS */
+       { 
+               return False;
+       }
 }
 
-/********************************************************
- Resolve a name into an IP address. Use this function if
- the string is either an IP address, DNS or host name
- or NetBIOS name. This uses the name switch in the
+/*******************************************************************
+ Internal interface to resolve a name into an IP address.
+ Use this function if the string is either an IP address, DNS
+ or host name or NetBIOS name. This uses the name switch in the
  smb.conf to determine the order of name resolution.
-*********************************************************/
-BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type)
+ Added support for ip addr/port to support ADS ldap servers.
+ the only place we currently care about the port is in the 
+ resolve_hosts() when looking up DC's via SRV RR entries in DNS
+**********************************************************************/
+
+static BOOL internal_resolve_name(const char *name, int name_type,
+                                 struct ip_service **return_iplist, 
+                                 int *return_count, const char *resolve_order)
 {
   pstring name_resolve_list;
   fstring tok;
-  char *ptr;
+  const char *ptr;
+  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;
+  int i;
 
-  if (strcmp(name,"0.0.0.0") == 0) {
-    return_ip->s_addr = 0;
-    return True;
-  }
-  if (strcmp(name,"255.255.255.255") == 0) {
-    return_ip->s_addr = 0xFFFFFFFF;
-    return True;
+  *return_iplist = NULL;
+  *return_count = 0;
+
+  DEBUG(10, ("internal_resolve_name: looking up %s#%x\n", name, name_type));
+
+  if (allzeros || allones || is_address) {
+  
+       if ( (*return_iplist = (struct ip_service *)malloc(sizeof(struct ip_service))) == NULL ) {
+               DEBUG(0,("internal_resolve_name: malloc fail !\n"));
+               return False;
+       }
+       
+       if(is_address) { 
+               /* ignore the port here */
+               (*return_iplist)->port = PORT_NONE;
+               
+               /* if it's in the form of an IP address then get the lib to interpret it */
+               if (((*return_iplist)->ip.s_addr = inet_addr(name)) == 0xFFFFFFFF ){
+                       DEBUG(1,("internal_resolve_name: inet_addr failed on %s\n", name));
+                       return False;
+               }
+       } else {
+               (*return_iplist)->ip.s_addr = allones ? 0xFFFFFFFF : 0;
+       }
+       *return_count = 1;
+       return True;
   }
-   
-  /* if it's in the form of an IP address then get the lib to interpret it */
-  if (is_ip_address(name)) {
-    return_ip->s_addr = inet_addr(name);
-    return True;
+  
+  /* Check name cache */
+
+  if (namecache_fetch(name, name_type, return_iplist, return_count)) {
+       /* This could be a negative response */
+       return (*return_count > 0);
   }
 
-  pstrcpy(name_resolve_list, lp_name_resolve_order());
-  ptr = name_resolve_list;
-  if (!ptr || !*ptr) ptr = "host";
+  /* set the name resolution order */
+
+  if ( strcmp( resolve_order, "NULL") == 0 ) {
+    DEBUG(8,("internal_resolve_name: all lookups disabled\n"));
+    return False;
+  }
+  
+  if ( !resolve_order )
+    pstrcpy(name_resolve_list, lp_name_resolve_order());
+  else
+    pstrcpy(name_resolve_list, resolve_order);
+  
+  if ( !name_resolve_list[0] )
+    ptr = "host";
+  else
+    ptr = name_resolve_list;
 
+  /* iterate through the name resolution backends */
+  
   while (next_token(&ptr, tok, LIST_SEP, sizeof(tok))) {
          if((strequal(tok, "host") || strequal(tok, "hosts"))) {
-                 if (name_type == 0x20 && resolve_hosts(name, return_ip)) {
-                         return True;
+                 if (resolve_hosts(name, name_type, return_iplist, return_count)) {
+                         result = True;
+                         goto done;
+                 }
+         } else if(strequal( tok, "ads")) {
+                  /* deal with 0x1c names here.  This will result in a
+                    SRV record lookup for _ldap._tcp.<domain> if we
+                    are using 'security = ads' */
+                 if (resolve_ads(name, name_type, return_iplist, return_count)) {
+                   result = True;
+                   goto done;
                  }
          } else if(strequal( tok, "lmhosts")) {
-                 if (resolve_lmhosts(name, return_ip, name_type)) {
-                         return True;
+                 if (resolve_lmhosts(name, name_type, return_iplist, return_count)) {
+                   result = True;
+                   goto done;
                  }
          } else if(strequal( tok, "wins")) {
                  /* don't resolve 1D via WINS */
                  if (name_type != 0x1D &&
-                     resolve_wins(name, return_ip, name_type)) {
-                         return True;
+                     resolve_wins(name, name_type, return_iplist, return_count)) {
+                   result = True;
+                   goto done;
                  }
          } else if(strequal( tok, "bcast")) {
-                 if (resolve_bcast(name, return_ip, name_type)) {
-                         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));
          }
   }
 
+  /* 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 ) {
+    *return_count = remove_duplicate_addrs2( *return_iplist, *return_count );
+  }
+  /* Save in name cache */
+  if ( DEBUGLEVEL >= 100 ) {
+    for (i = 0; i < *return_count && DEBUGLEVEL == 100; i++)
+      DEBUG(100, ("Storing name %s of type %d (%s:%d)\n", name,
+                name_type, inet_ntoa((*return_iplist)[i].ip), (*return_iplist)[i].port));
+  }
+   
+  namecache_store(name, name_type, *return_count, *return_iplist);
+
+  /* Display some debugging info */
+
+  if ( DEBUGLEVEL >= 10 ) {
+    DEBUG(10, ("internal_resolve_name: returning %d addresses: ", 
+              *return_count));
+
+    for (i = 0; i < *return_count; i++)
+         DEBUGADD(10, ("%s:%d ", inet_ntoa((*return_iplist)[i].ip), (*return_iplist)[i].port));
+
+    DEBUG(10, ("\n"));
+  }
+  
+  return result;
 }
 
 /********************************************************
- resolve a name of format \\server_name or \\ipaddress
- into a name.  also, cut the \\ from the front for us.
+ Internal interface to resolve a name into one IP address.
+ Use this function if the string is either an IP address, DNS
+ or host name or NetBIOS name. This uses the name switch in the
+ smb.conf to determine the order of name resolution.
 *********************************************************/
-BOOL resolve_srv_name(const char* srv_name, fstring dest_host,
-                               struct in_addr *ip)
-{
-       BOOL ret;
-       const char *sv_name = srv_name;
 
-       DEBUG(10,("resolve_srv_name: %s\n", srv_name));
+BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type)
+{
+       struct ip_service *ip_list = NULL;
+       int count = 0;
 
-       if (srv_name == NULL || strequal("\\\\.", srv_name))
-       {
-               fstrcpy(dest_host, global_myname);
-               ip = interpret_addr2("127.0.0.1");
+       if (is_ipaddress(name)) {
+               *return_ip = *interpret_addr2(name);
                return True;
        }
 
-       if (strnequal("\\\\", srv_name, 2))
-       {
-               sv_name = &srv_name[2];
+       if (internal_resolve_name(name, name_type, &ip_list, &count, lp_name_resolve_order())) {
+               int i;
+               
+               /* only return valid addresses for TCP connections */
+               for (i=0; i<count; i++) {
+                       char *ip_str = inet_ntoa(ip_list[i].ip);
+                       if (ip_str &&
+                           strcmp(ip_str, "255.255.255.255") != 0 &&
+                           strcmp(ip_str, "0.0.0.0") != 0) 
+                       {
+                               *return_ip = ip_list[i].ip;
+                               SAFE_FREE(ip_list);
+                               return True;
+                       }
+               }
        }
-
-       fstrcpy(dest_host, sv_name);
-       ret = resolve_name(dest_host, ip, 0x20);
        
-       if (is_ip_address(dest_host))
-       {
-               fstrcpy(dest_host, "*SMBSERVER");
+       SAFE_FREE(ip_list);
+       return False;
+}
+
+/********************************************************
+ Find the IP address of the master browser or DMB for a workgroup.
+*********************************************************/
+
+BOOL find_master_ip(const char *group, struct in_addr *master_ip)
+{
+       struct ip_service *ip_list = NULL;
+       int count = 0;
+
+       if (lp_disable_netbios()) {
+               DEBUG(5,("find_master_ip(%s): netbios is disabled\n", group));
+               return False;
+       }
+
+       if (internal_resolve_name(group, 0x1D, &ip_list, &count, lp_name_resolve_order())) {
+               *master_ip = ip_list[0].ip;
+               SAFE_FREE(ip_list);
+               return True;
        }
+       if(internal_resolve_name(group, 0x1B, &ip_list, &count, lp_name_resolve_order())) {
+               *master_ip = ip_list[0].ip;
+               SAFE_FREE(ip_list);
+               return True;
+       }
+
+       SAFE_FREE(ip_list);
+       return False;
+}
+
+/********************************************************
+ Get the IP address list of the primary domain controller
+ for a domain.
+*********************************************************/
+
+BOOL get_pdc_ip(const char *domain, struct in_addr *ip)
+{
+       struct ip_service *ip_list;
+       int count;
+
+       /* Look up #1B name */
+
+       if (!internal_resolve_name(domain, 0x1b, &ip_list, &count, lp_name_resolve_order()))
+               return False;
+
+       /* if we get more than 1 IP back we have to assume it is a
+          multi-homed PDC and not a mess up */
+
+       if ( count > 1 ) {
+               DEBUG(6,("get_pdc_ip: PDC has %d IP addresses!\n", count));             
+               sort_ip_list2( ip_list, count );
+       }
+
+       *ip = ip_list[0].ip;
        
-       return ret;
+       SAFE_FREE(ip_list);
+
+       return True;
 }
 
 /********************************************************
-find the IP address of the master browser or DMB for a workgroup
+ Get the IP address list of the domain controllers for
+ a domain.
 *********************************************************/
-BOOL find_master_ip(char *group, struct in_addr *master_ip)
+
+static BOOL get_dc_list(const char *domain, struct ip_service **ip_list, 
+                 int *count, BOOL ads_only, int *ordered)
 {
-       if (resolve_name(group, master_ip, 0x1D)) return True;
+       fstring resolve_order;
+
+       /* if we are restricted to solely using DNS for looking
+          up a domain controller, make sure that host lookups
+          are enabled for the 'name resolve order'.  If host lookups
+          are disabled and ads_only is True, then set the string to
+          NULL. */
+
+       fstrcpy( resolve_order, lp_name_resolve_order() );
+       strlower_m( resolve_order );
+       if ( ads_only )  {
+               if ( strstr( resolve_order, "host" ) )
+                       fstrcpy( resolve_order, "ads" );
+               else
+                       fstrcpy( resolve_order, "NULL" );
+       }
+
+       
+       *ordered = False;
+               
+       /* If it's our domain then use the 'password server' parameter. */
+
+       if ( strequal(domain, lp_workgroup()) || strequal(domain, lp_realm()) ) {
+               const char *p;
+               char *pserver = lp_passwordserver(); /* UNIX charset. */
+               char *port_str;
+               int port;
+               fstring name;
+               int num_addresses = 0;
+               int  local_count, i, j;
+               struct ip_service *return_iplist = NULL;
+               struct ip_service *auto_ip_list = NULL;
+               BOOL done_auto_lookup = False;
+               int auto_count = 0;
+               
+
+               if (!*pserver)
+                       return internal_resolve_name(domain, 0x1C, ip_list, count, resolve_order);
+
+               p = pserver;
+
+               /*
+                * if '*' appears in the "password server" list then add
+                * an auto lookup to the list of manually configured
+                * DC's.  If any DC is listed by name, then the list should be 
+                * considered to be ordered 
+                */
+                
+               while (next_token(&p,name,LIST_SEP,sizeof(name))) {
+                       if (strequal(name, "*")) {
+                               if ( internal_resolve_name(domain, 0x1C, &auto_ip_list, &auto_count, resolve_order) )
+                                       num_addresses += auto_count;
+                               done_auto_lookup = True;
+                               DEBUG(8,("Adding %d DC's from auto lookup\n", auto_count));
+                       }
+                       else 
+                               num_addresses++;
+               }
+
+               /* if we have no addresses and haven't done the auto lookup, then
+                  just return the list of DC's */
+                  
+               if ( (num_addresses == 0) && !done_auto_lookup )
+                       return internal_resolve_name(domain, 0x1C, ip_list, count, resolve_order);
+
+               /* maybe we just failed? */
+               
+               if ( num_addresses == 0 ) {
+                       DEBUG(4,("get_dc_list: no servers found\n"));
+                       return False;
+               }
+               
+               if ( (return_iplist = (struct ip_service *)
+                       malloc(num_addresses * sizeof(struct ip_service))) == NULL ) 
+               {
+                       DEBUG(3,("get_dc_list: malloc fail !\n"));
+                       return False;
+               }
+
+               p = pserver;
+               local_count = 0;
+
+               /* fill in the return list now with real IP's */
+                               
+               while ( (local_count<num_addresses) && next_token(&p,name,LIST_SEP,sizeof(name)) ) {
+                       struct in_addr name_ip;
+                       
+                       /* copy any addersses from the auto lookup */
+                       
+                       if ( strequal(name, "*") ) {
+                               for ( j=0; j<auto_count; j++ ) {
+                                       return_iplist[local_count].ip   = auto_ip_list[j].ip;
+                                       return_iplist[local_count].port = auto_ip_list[j].port;
+                                       local_count++;
+                               }
+                               continue;
+                       }
+                       
+                       
+                       /* added support for address:port syntax for ads (not that I think 
+                          anyone will ever run the LDAP server in an AD domain on something 
+                          other than port 389 */
+                       
+                       port = (lp_security() == SEC_ADS) ? LDAP_PORT : PORT_NONE;
+                       if ( (port_str=strchr(name, ':')) != NULL ) {
+                               *port_str = '\0';
+                               port_str++;
+                               port = atoi( port_str );
+                       }
+
+                       /* explicit lookup; resolve_name() will handle names & IP addresses */
+                       if ( resolve_name( name, &name_ip, 0x20 ) ) {
+                               return_iplist[local_count].ip   = name_ip;
+                               return_iplist[local_count].port = port;
+                               local_count++;
+                               *ordered = True;
+                       }
+               }
+                               
+               SAFE_FREE(auto_ip_list);
+
+               /* need to remove duplicates in the list if we have any 
+                  explicit password servers */
+                  
+               if ( local_count )
+                       local_count = remove_duplicate_addrs2( return_iplist, local_count );
+               
+               if ( DEBUGLEVEL >= 4 ) {
+                       DEBUG(4,("get_dc_list: returning %d ip addresses in an %sordered list\n", local_count, 
+                               *ordered ? "":"un"));
+                       DEBUG(4,("get_dc_list: "));
+                       for ( i=0; i<local_count; i++ )
+                               DEBUGADD(4,("%s:%d ", inet_ntoa(return_iplist[i].ip), return_iplist[i].port ));
+                       DEBUGADD(4,("\n"));
+               }
+                       
+               *ip_list = return_iplist;
+               *count = local_count;
 
-       return resolve_name(group, master_ip, 0x1B);
+               return (*count != 0);
+       }
+       
+       DEBUG(10,("get_dc_list: defaulting to internal auto lookup for domain %s\n", domain));
+       
+       return internal_resolve_name(domain, 0x1C, ip_list, count, resolve_order);
 }
+
+/*********************************************************************
+ small wrapper function to get the DC list and sort it if neccessary 
+*********************************************************************/
+BOOL get_sorted_dc_list( const char *domain, struct ip_service **ip_list, int *count, BOOL ads_only )
+{
+       BOOL ordered;
+       
+       DEBUG(8,("get_sorted_dc_list: attempting lookup using [%s]\n",
+               (ads_only ? "ads" : lp_name_resolve_order())));
+       
+       if ( !get_dc_list(domain, ip_list, count, ads_only, &ordered) )
+               return False;
+               
+       /* only sort if we don't already have an ordered list */
+       if ( !ordered )
+               sort_ip_list2( *ip_list, *count );
+               
+       return True;
+}
+