lib: Remove unused serverid.tdb
[samba.git] / source3 / nmbd / nmbd_browsesync.c
index b177fb524e9876a20d1c7f0835f8d776458657bd..b1517f89c9f27a6941e4cef43cc981fff8caee01 100644 (file)
@@ -1,14 +1,13 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 1.9.
+   Unix SMB/CIFS implementation.
    NBT netbios routines and daemon - version 2
    Copyright (C) Andrew Tridgell 1994-1998
    Copyright (C) Luke Kenneth Casson Leighton 1994-1998
-   Copyright (C) Jeremy Allison 1994-1998
+   Copyright (C) Jeremy Allison 1994-2003
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    
 */
 
 #include "includes.h"
-#include "smb.h"
-
-extern int DEBUGLEVEL;
-extern pstring scope;
-extern struct in_addr ipzero;
-extern pstring global_myname;
-extern fstring global_myworkgroup;
+#include "nmbd/nmbd.h"
 
 /* This is our local master browser list database. */
-extern ubi_dlList lmb_browserlist[];
+extern struct browse_cache_record *lmb_browserlist;
 
 /****************************************************************************
 As a domain master browser, do a sync with a local master browser.
 **************************************************************************/
+
 static void sync_with_lmb(struct browse_cache_record *browc)
 {                     
-  struct work_record *work;
-
-  if( !(work = find_workgroup_on_subnet(unicast_subnet, browc->work_group)) )
-  {
-    if( DEBUGLVL( 0 ) )
-    {
-      dbgtext( "sync_with_lmb:\n" );
-      dbgtext( "Failed to get a workgroup for a local master browser " );
-      dbgtext( "cache entry workgroup " );
-      dbgtext( "%s, server %s\n", browc->work_group, browc->lmb_name );
-    }
-    return;
-  }
+       struct work_record *work;
 
-  /* We should only be doing this if we are a domain master browser for
-     the given workgroup. Ensure this is so. */
-
-  if(!AM_DOMAIN_MASTER_BROWSER(work))
-  {
-    if( DEBUGLVL( 0 ) )
-    {
-      dbgtext( "sync_with_lmb:\n" );
-      dbgtext( "We are trying to sync with a local master browser " );
-      dbgtext( "%s for workgroup %s\n", browc->lmb_name, browc->work_group );
-      dbgtext( "and we are not a domain master browser on this workgroup.\n" );
-      dbgtext( "Error!\n" );
-    }
-    return;
-  }
+       if( !(work = find_workgroup_on_subnet(unicast_subnet, browc->work_group)) ) {
+               if( DEBUGLVL( 0 ) ) {
+                       dbgtext( "sync_with_lmb:\n" );
+                       dbgtext( "Failed to get a workgroup for a local master browser " );
+                       dbgtext( "cache entry workgroup " );
+                       dbgtext( "%s, server %s\n", browc->work_group, browc->lmb_name );
+               }
+               return;
+       }
 
-  if( DEBUGLVL( 2 ) )
-  {
-    dbgtext( "sync_with_lmb:\n" );
-    dbgtext( "Initiating sync with local master browser " );
-    dbgtext( "%s<0x20> at IP %s ", browc->lmb_name, inet_ntoa(browc->ip) );
-    dbgtext( "for workgroup %s\n", browc->work_group );
-  }
+       /* We should only be doing this if we are a domain master browser for
+               the given workgroup. Ensure this is so. */
 
-  sync_browse_lists(work, browc->lmb_name, 0x20, browc->ip, True, True);
+       if(!AM_DOMAIN_MASTER_BROWSER(work)) {
+               if( DEBUGLVL( 0 ) ) {
+                       dbgtext( "sync_with_lmb:\n" );
+                       dbgtext( "We are trying to sync with a local master browser " );
+                       dbgtext( "%s for workgroup %s\n", browc->lmb_name, browc->work_group );
+                       dbgtext( "and we are not a domain master browser on this workgroup.\n" );
+                       dbgtext( "Error!\n" );
+               }
+               return;
+       }
+
+       if( DEBUGLVL( 2 ) ) {
+               dbgtext( "sync_with_lmb:\n" );
+               dbgtext( "Initiating sync with local master browser " );
+               dbgtext( "%s<0x20> at IP %s ", browc->lmb_name, inet_ntoa(browc->ip) );
+               dbgtext( "for workgroup %s\n", browc->work_group );
+       }
+
+       sync_browse_lists(work, browc->lmb_name, 0x20, browc->ip, True, True);
 
-  browc->sync_time += (CHECK_TIME_DMB_TO_LMB_SYNC * 60);
+       browc->sync_time += (CHECK_TIME_DMB_TO_LMB_SYNC * 60);
 }
 
 /****************************************************************************
 Sync or expire any local master browsers.
 **************************************************************************/
+
 void dmb_expire_and_sync_browser_lists(time_t t)
 {
-  static time_t last_run = 0;
-  struct browse_cache_record *browc;
+       static time_t last_run = 0;
+       struct browse_cache_record *browc;
 
-  /* Only do this every 20 seconds. */  
-  if (t - last_run < 20) 
-   return;
+       /* Only do this every 20 seconds. */  
+       if (t - last_run < 20) 
+               return;
 
-  last_run = t;
+       last_run = t;
 
-  expire_lmb_browsers(t);
+       expire_lmb_browsers(t);
 
-  for( browc = (struct browse_cache_record *)ubi_dlFirst( lmb_browserlist );
-       browc;
-       browc = (struct browse_cache_record *)ubi_dlNext( browc ) )
-  {
-    if (browc->sync_time < t)
-      sync_with_lmb(browc);
-  }
+       for( browc = lmb_browserlist; browc; browc = browc->next ) {
+               if (browc->sync_time < t)
+                       sync_with_lmb(browc);
+       }
 }
 
 /****************************************************************************
@@ -113,42 +99,49 @@ As a local master browser, send an announce packet to the domain master browser.
 
 static void announce_local_master_browser_to_domain_master_browser( struct work_record *work)
 {
-  pstring outbuf;
-  char *p;
-
-  if(ismyip(work->dmb_addr))
-  {
-    if( DEBUGLVL( 2 ) )
-    {
-      dbgtext( "announce_local_master_browser_to_domain_master_browser:\n" );
-      dbgtext( "We are both a domain and a local master browser for " );
-      dbgtext( "workgroup %s.  ", work->work_group );
-      dbgtext( "Do not announce to ourselves.\n" );
-    }
-    return;
-  }
+       char outbuf[1024];
+       unstring myname;
+       unstring dmb_name;
+       char *p;
+
+       if(ismyip_v4(work->dmb_addr)) {
+               if( DEBUGLVL( 2 ) ) {
+                       dbgtext( "announce_local_master_browser_to_domain_master_browser:\n" );
+                       dbgtext( "We are both a domain and a local master browser for " );
+                       dbgtext( "workgroup %s.  ", work->work_group );
+                       dbgtext( "Do not announce to ourselves.\n" );
+               }
+               return;
+       }
 
-  memset(outbuf,'\0',sizeof(outbuf));
-  p = outbuf;
-  CVAL(p,0) = ANN_MasterAnnouncement;
-  p++;
-
-  StrnCpy(p,global_myname,15);
-  strupper(p);
-  p = skip_string(p,1);
-
-  if( DEBUGLVL( 4 ) )
-  {
-    dbgtext( "announce_local_master_browser_to_domain_master_browser:\n" );
-    dbgtext( "Sending local master announce to " );
-    dbgtext( "%s for workgroup %s.\n", nmb_namestr(&work->dmb_name),
-                                       work->work_group );
-  }
+       memset(outbuf,'\0',sizeof(outbuf));
+       p = outbuf;
+       SCVAL(p,0,ANN_MasterAnnouncement);
+       p++;
 
-  send_mailslot(True, BROWSE_MAILSLOT, outbuf,PTR_DIFF(p,outbuf),
-               global_myname, 0x0, work->dmb_name.name, 0x0, 
-               work->dmb_addr, FIRST_SUBNET->myip, DGRAM_PORT);
+       unstrcpy(myname, lp_netbios_name());
+       if (!strupper_m(myname)) {
+               DEBUG(2,("strupper_m %s failed\n", myname));
+               return;
+       }
+       myname[15]='\0';
+       /* The call below does CH_UNIX -> CH_DOS conversion. JRA */
+       push_ascii(p, myname, sizeof(outbuf)-PTR_DIFF(p,outbuf)-1, STR_TERMINATE);
+
+       p = skip_string(outbuf,sizeof(outbuf),p);
+
+       if( DEBUGLVL( 4 ) ) {
+               dbgtext( "announce_local_master_browser_to_domain_master_browser:\n" );
+               dbgtext( "Sending local master announce to " );
+               dbgtext( "%s for workgroup %s.\n", nmb_namestr(&work->dmb_name),
+                                       work->work_group );
+       }
 
+       /* Target name for send_mailslot must be in UNIX charset. */
+       pull_ascii_nstring(dmb_name, sizeof(dmb_name), work->dmb_name.name);
+       send_mailslot(True, BROWSE_MAILSLOT, outbuf,PTR_DIFF(p,outbuf),
+               lp_netbios_name(), 0x0, dmb_name, 0x0,
+               work->dmb_addr, FIRST_SUBNET->myip, DGRAM_PORT);
 }
 
 /****************************************************************************
@@ -157,17 +150,19 @@ As a local master browser, do a sync with a domain master browser.
 
 static void sync_with_dmb(struct work_record *work)
 {
-  if( DEBUGLVL( 2 ) )
-  {
-    dbgtext( "sync_with_dmb:\n" );
-    dbgtext( "Initiating sync with domain master browser " );
-    dbgtext( "%s ", nmb_namestr(&work->dmb_name) );
-    dbgtext( "at IP %s ", inet_ntoa(work->dmb_addr) );
-    dbgtext( "for workgroup %s\n", work->work_group );
-  }
+       unstring dmb_name;
+
+       if( DEBUGLVL( 2 ) ) {
+               dbgtext( "sync_with_dmb:\n" );
+               dbgtext( "Initiating sync with domain master browser " );
+               dbgtext( "%s ", nmb_namestr(&work->dmb_name) );
+               dbgtext( "at IP %s ", inet_ntoa(work->dmb_addr) );
+               dbgtext( "for workgroup %s\n", work->work_group );
+       }
 
-  sync_browse_lists(work, work->dmb_name.name, work->dmb_name.name_type, 
-                    work->dmb_addr, False, True);
+       pull_ascii_nstring(dmb_name, sizeof(dmb_name), work->dmb_name.name);
+       sync_browse_lists(work, dmb_name, work->dmb_name.name_type, 
+               work->dmb_addr, False, True);
 }
 
 /****************************************************************************
@@ -179,78 +174,69 @@ static void domain_master_node_status_success(struct subnet_record *subrec,
                                               struct res_rec *answers,
                                               struct in_addr from_ip)
 {
-  struct work_record *work = find_workgroup_on_subnet( subrec, userdata->data);
-
-  if( work == NULL )
-  {
-    if( DEBUGLVL( 0 ) )
-    {
-      dbgtext( "domain_master_node_status_success:\n" );
-      dbgtext( "Unable to find workgroup " );
-      dbgtext( "%s on subnet %s.\n", userdata->data, subrec->subnet_name );
-    }
-    return;
-  }
+       struct work_record *work = find_workgroup_on_subnet( subrec, userdata->data);
 
-  if( DEBUGLVL( 3 ) )
-  {
-    dbgtext( "domain_master_node_status_success:\n" );
-    dbgtext( "Success in node status for workgroup " );
-    dbgtext( "%s from ip %s\n", work->work_group, inet_ntoa(from_ip) );
-  }
+       if( work == NULL ) {
+               if( DEBUGLVL( 0 ) ) {
+                       dbgtext( "domain_master_node_status_success:\n" );
+                       dbgtext( "Unable to find workgroup " );
+                       dbgtext( "%s on subnet %s.\n", userdata->data, subrec->subnet_name );
+               }
+               return;
+       }
+
+       if( DEBUGLVL( 3 ) ) {
+               dbgtext( "domain_master_node_status_success:\n" );
+               dbgtext( "Success in node status for workgroup " );
+               dbgtext( "%s from ip %s\n", work->work_group, inet_ntoa(from_ip) );
+       }
 
   /* Go through the list of names found at answers->rdata and look for
      the first SERVER<0x20> name. */
 
-  if(answers->rdata != NULL)
-  {
-    char *p = answers->rdata;
-    int numnames = CVAL(p, 0);
+       if (answers->rdlength > 0) {
+               char *p = answers->rdata;
+               int numnames = CVAL(p, 0);
 
-    p += 1;
+               p += 1;
 
-    while (numnames--)
-    {
-      char qname[17];
-      uint16 nb_flags;
-      int name_type;
+               while (numnames--) {
+                       unstring qname;
+                       uint16_t nb_flags;
+                       int name_type;
 
-      StrnCpy(qname,p,15);
-      name_type = CVAL(p,15);
-      nb_flags = get_nb_flags(&p[16]);
-      trim_string(qname,NULL," ");
+                       pull_ascii_nstring(qname, sizeof(qname), p);
+                       name_type = CVAL(p,15);
+                       nb_flags = get_nb_flags(&p[16]);
+                       trim_char(qname,'\0',' ');
 
-      p += 18;
+                       p += 18;
 
-      if(!(nb_flags & NB_GROUP) && (name_type == 0x20))
-      {
-        struct nmb_name nmbname;
+                       if(!(nb_flags & NB_GROUP) && (name_type == 0x20)) {
+                               struct nmb_name nmbname;
 
-        make_nmb_name(&nmbname, qname, name_type, scope);
+                               make_nmb_name(&nmbname, qname, name_type);
 
-        /* Copy the dmb name and IP address
-           into the workgroup struct. */
+                               /* Copy the dmb name and IP address
+                                       into the workgroup struct. */
 
-        work->dmb_name = nmbname;
-        putip((char *)&work->dmb_addr, &from_ip);
+                               work->dmb_name = nmbname;
+                               putip((char *)&work->dmb_addr, &from_ip);
 
-        /* Do the local master browser announcement to the domain
-           master browser name and IP. */
-        announce_local_master_browser_to_domain_master_browser( work );
+                               /* Do the local master browser announcement to the domain
+                                       master browser name and IP. */
+                               announce_local_master_browser_to_domain_master_browser( work );
 
-        /* Now synchronise lists with the domain master browser. */
-        sync_with_dmb(work);
-        break;
-      }
-    }
-  }
-  else
-    if( DEBUGLVL( 0 ) )
-    {
-      dbgtext( "domain_master_node_status_success:\n" );
-      dbgtext( "Failed to find a SERVER<0x20> name in reply from IP " );
-      dbgtext( "%s.\n", inet_ntoa(from_ip) );
-    }
+                               /* Now synchronise lists with the domain master browser. */
+                               sync_with_dmb(work);
+                               break;
+                       }
+               }
+       } else if( DEBUGLVL( 0 ) ) {
+               dbgtext( "domain_master_node_status_success:\n" );
+               dbgtext( "Failed to find a SERVER<0x20> name in reply from IP " );
+               dbgtext( "%s.\n", inet_ntoa(from_ip) );
+       }
 }
 
 /****************************************************************************
@@ -260,16 +246,15 @@ static void domain_master_node_status_success(struct subnet_record *subrec,
 static void domain_master_node_status_fail(struct subnet_record *subrec,
                        struct response_record *rrec)
 {
-  struct userdata_struct *userdata = rrec->userdata;
-
-  if( DEBUGLVL( 0 ) )
-  {
-    dbgtext( "domain_master_node_status_fail:\n" );
-    dbgtext( "Doing a node status request to the domain master browser\n" );
-    dbgtext( "for workgroup %s ", userdata->data );
-    dbgtext( "at IP %s failed.\n", inet_ntoa(rrec->packet->ip) );
-    dbgtext( "Cannot sync browser lists.\n" );
-  }
+       struct userdata_struct *userdata = rrec->userdata;
+
+       if( DEBUGLVL( 0 ) ) {
+               dbgtext( "domain_master_node_status_fail:\n" );
+               dbgtext( "Doing a node status request to the domain master browser\n" );
+               dbgtext( "for workgroup %s ", userdata ? userdata->data : "NULL" );
+               dbgtext( "at IP %s failed.\n", inet_ntoa(rrec->packet->ip) );
+               dbgtext( "Cannot sync browser lists.\n" );
+       }
 }
 
 /****************************************************************************
@@ -280,93 +265,99 @@ static void find_domain_master_name_query_success(struct subnet_record *subrec,
                         struct userdata_struct *userdata_in,
                         struct nmb_name *q_name, struct in_addr answer_ip, struct res_rec *rrec)
 {
-  /* 
-   * Unfortunately, finding the IP address of the Domain Master Browser,
-   * as we have here, is not enough. We need to now do a sync to the
-   * SERVERNAME<0x20> NetBIOS name, as only recent NT servers will
-   * respond to the SMBSERVER name. To get this name from IP
-   * address we do a Node status request, and look for the first
-   * NAME<0x20> in the response, and take that as the server name.
-   * We also keep a cache of the Domain Master Browser name for this
-   * workgroup in the Workgroup struct, so that if the same IP addess
-   * is returned every time, we don't need to do the node status
-   * request.
-   */
-
-  struct work_record *work;
-  struct nmb_name nmbname;
-  struct userdata_struct *userdata;
-  int size = sizeof(struct userdata_struct) + sizeof(fstring)+1;
-
-  if( !(work = find_workgroup_on_subnet(subrec, q_name->name)) )
-  {
-    if( DEBUGLVL( 0 ) )
-      {
-      dbgtext( "find_domain_master_name_query_success:\n" );
-      dbgtext( "Failed to find workgroup %s\n", q_name->name );
-      }
-    return;
+       /* 
+        * Unfortunately, finding the IP address of the Domain Master Browser,
+        * as we have here, is not enough. We need to now do a sync to the
+        * SERVERNAME<0x20> NetBIOS name, as only recent NT servers will
+        * respond to the SMBSERVER name. To get this name from IP
+        * address we do a Node status request, and look for the first
+        * NAME<0x20> in the response, and take that as the server name.
+        * We also keep a cache of the Domain Master Browser name for this
+        * workgroup in the Workgroup struct, so that if the same IP addess
+        * is returned every time, we don't need to do the node status
+        * request.
+        */
+
+       struct work_record *work;
+       struct nmb_name nmbname;
+       struct userdata_struct *userdata;
+       size_t size = sizeof(struct userdata_struct) + sizeof(fstring)+1;
+       unstring qname;
+
+       pull_ascii_nstring(qname, sizeof(qname), q_name->name);
+       if( !(work = find_workgroup_on_subnet(subrec, qname)) ) {
+               if( DEBUGLVL( 0 ) ) {
+                       dbgtext( "find_domain_master_name_query_success:\n" );
+                       dbgtext( "Failed to find workgroup %s\n", qname);
+               }
+       return;
   }
 
   /* First check if we already have a dmb for this workgroup. */
 
-  if(!ip_equal(work->dmb_addr, ipzero) && ip_equal(work->dmb_addr, answer_ip))
-  {
-    /* Do the local master browser announcement to the domain
-       master browser name and IP. */
-    announce_local_master_browser_to_domain_master_browser( work );
+       if(!is_zero_ip_v4(work->dmb_addr) && ip_equal_v4(work->dmb_addr, answer_ip)) {
+               /* Do the local master browser announcement to the domain
+                       master browser name and IP. */
+               announce_local_master_browser_to_domain_master_browser( work );
 
-    /* Now synchronise lists with the domain master browser. */
-    sync_with_dmb(work);
-    return;
-  }
-  else
-    putip((char *)&work->dmb_addr, &ipzero);
-
-  /* Now initiate the node status request. */
-  memset((char *)&nmbname, '\0',sizeof(nmbname));
-  nmbname.name[0] = '*';
-
-  /* Put the workgroup name into the userdata so we know
-     what workgroup we're talking to when the reply comes
-     back. */
-
-  /* Setup the userdata_struct - this is copied so we can use
-     a stack variable for this. */
-  if((userdata = (struct userdata_struct *)malloc(size)) == NULL)
-  {
-    DEBUG(0, ("find_domain_master_name_query_success: malloc fail.\n"));
-    return;
-  }
+               /* Now synchronise lists with the domain master browser. */
+               sync_with_dmb(work);
+               return;
+       } else {
+               zero_ip_v4(&work->dmb_addr);
+       }
+
+       /* Now initiate the node status request. */
+
+       /* We used to use the name "*",0x0 here, but some Windows
+        * servers don't answer that name. However we *know* they
+        * have the name workgroup#1b (as we just looked it up).
+        * So do the node status request on this name instead.
+        * Found at LBL labs. JRA.
+        */
+
+       make_nmb_name(&nmbname,work->work_group,0x1b);
+
+       /* Put the workgroup name into the userdata so we know
+        what workgroup we're talking to when the reply comes
+        back. */
+
+       /* Setup the userdata_struct - this is copied so we can use
+       a stack variable for this. */
 
-  userdata->copy_fn = NULL;
-  userdata->free_fn = NULL;
-  userdata->userdata_len = strlen(work->work_group)+1;
-  pstrcpy(userdata->data, work->work_group);
+       if((userdata = (struct userdata_struct *)SMB_MALLOC(size)) == NULL) {
+               DEBUG(0, ("find_domain_master_name_query_success: malloc fail.\n"));
+               return;
+       }
 
-  node_status( subrec, &nmbname, answer_ip, 
-               domain_master_node_status_success,
-               domain_master_node_status_fail,
-               userdata);
+       userdata->copy_fn = NULL;
+       userdata->free_fn = NULL;
+       userdata->userdata_len = strlen(work->work_group)+1;
+       strlcpy(userdata->data, work->work_group, size - sizeof(*userdata));
 
-  zero_free(userdata, size);
+       node_status( subrec, &nmbname, answer_ip, 
+               domain_master_node_status_success,
+               domain_master_node_status_fail,
+               userdata);
+
+       zero_free(userdata, size);
 }
 
 /****************************************************************************
   Function called when a query for a WORKGROUP<1b> name fails.
   ****************************************************************************/
+
 static void find_domain_master_name_query_fail(struct subnet_record *subrec,
                                     struct response_record *rrec,
                                     struct nmb_name *question_name, int fail_code)
 {
-  if( DEBUGLVL( 0 ) )
-  {
-    dbgtext( "find_domain_master_name_query_fail:\n" );
-    dbgtext( "Unable to find the Domain Master Browser name " );
-    dbgtext( "%s for the workgroup %s.\n",
-             nmb_namestr(question_name), question_name->name );
-    dbgtext( "Unable to sync browse lists in this workgroup.\n" );
-  }
+       if( DEBUGLVL( 0 ) ) {
+               dbgtext( "find_domain_master_name_query_fail:\n" );
+               dbgtext( "Unable to find the Domain Master Browser name " );
+               dbgtext( "%s for the workgroup %s.\n",
+                       nmb_namestr(question_name), question_name->name );
+               dbgtext( "Unable to sync browse lists in this workgroup.\n" );
+       }
 }
 
 /****************************************************************************
@@ -378,27 +369,20 @@ full domain browse lists from it onto the given subnet.
 void announce_and_sync_with_domain_master_browser( struct subnet_record *subrec,
                                                    struct work_record *work)
 {
-  struct nmb_name nmbname;
-
-  /* Only do this if we are using a WINS server. */
-  if(we_are_a_wins_client() == False)
-  {
-    if( DEBUGLVL( 10 ) )
-    {
-      dbgtext( "announce_and_sync_with_domain_master_browser:\n" );
-      dbgtext( "Ignoring, as we are not a WINS client.\n" );
-    }
-    return;
-  }
-
-  make_nmb_name(&nmbname,work->work_group,0x1b,scope);
+       /* Only do this if we are using a WINS server. */
+       if(we_are_a_wins_client() == False) {
+               if( DEBUGLVL( 10 ) ) {
+                       dbgtext( "announce_and_sync_with_domain_master_browser:\n" );
+                       dbgtext( "Ignoring, as we are not a WINS client.\n" );
+               }
+               return;
+       }
 
-  /* First, query for the WORKGROUP<1b> name from the WINS server. */
-  query_name(unicast_subnet, nmbname.name, nmbname.name_type,
+       /* First, query for the WORKGROUP<1b> name from the WINS server. */
+       query_name(unicast_subnet, work->work_group, 0x1b,
              find_domain_master_name_query_success,
              find_domain_master_name_query_fail,
              NULL);
-
 }
 
 /****************************************************************************
@@ -418,89 +402,87 @@ static void get_domain_master_name_node_status_success(struct subnet_record *sub
                                               struct res_rec *answers,
                                               struct in_addr from_ip)
 {
-  struct work_record *work;
-  fstring server_name;
+       unstring server_name;
 
-  server_name[0] = 0;
+       server_name[0] = 0;
 
-  if( DEBUGLVL( 3 ) )
-  {
-    dbgtext( "get_domain_master_name_node_status_success:\n" );
-    dbgtext( "Success in node status from ip %s\n", inet_ntoa(from_ip) );
-  }
+       if( DEBUGLVL( 3 ) ) {
+               dbgtext( "get_domain_master_name_node_status_success:\n" );
+               dbgtext( "Success in node status from ip %s\n", inet_ntoa(from_ip) );
+       }
 
-  /* 
-   * Go through the list of names found at answers->rdata and look for
-   * the first WORKGROUP<0x1b> name.
-   */
-
-  if(answers->rdata != NULL)
-  {
-    char *p = answers->rdata;
-    int numnames = CVAL(p, 0);
-
-    p += 1;
-
-    while (numnames--)
-    {
-      char qname[17];
-      uint16 nb_flags;
-      int name_type;
-
-      StrnCpy(qname,p,15);
-      name_type = CVAL(p,15);
-      nb_flags = get_nb_flags(&p[16]);
-      trim_string(qname,NULL," ");
-
-      p += 18;
-
-      if(!(nb_flags & NB_GROUP) && (name_type == 0x00) && 
-        server_name[0] == 0) {
-             /* this is almost certainly the server netbios name */
-             fstrcpy(server_name, qname);
-             continue;
-      }
-
-      if(!(nb_flags & NB_GROUP) && (name_type == 0x1b))
-      {
-        if( DEBUGLVL( 5 ) )
-        {
-          dbgtext( "get_domain_master_name_node_status_success:\n" );
-          dbgtext( "%s(%s) ", server_name, inet_ntoa(from_ip) );
-          dbgtext( "is a domain master browser for workgroup " );
-          dbgtext( "%s. Adding this name.\n", qname );
-        }
-
-        /* 
-         * If we don't already know about this workgroup, add it
-         * to the workgroup list on the unicast_subnet.
-         */
-        if((work = find_workgroup_on_subnet( subrec, qname)) == NULL)
-       {
-               struct nmb_name nmbname;
-               /* 
-                * Add it - with an hour in the cache.
-                */
-               if(!(work= create_workgroup_on_subnet(subrec, qname, 60*60)))
-                       return;
-
-               /* remember who the master is */
-               fstrcpy(work->local_master_browser_name, server_name);
-               make_nmb_name(&nmbname, server_name, 0x20, scope);
-               work->dmb_name = nmbname;
-               work->dmb_addr = from_ip;
-        }
-        break;
-      }
-    }
-  }
-  else
-    if( DEBUGLVL( 0 ) )
-    {
-      dbgtext( "get_domain_master_name_node_status_success:\n" );
-      dbgtext( "Failed to find a WORKGROUP<0x1b> name in reply from IP " );
-      dbgtext( "%s.\n", inet_ntoa(from_ip) );
-    }
+       /* 
+        * Go through the list of names found at answers->rdata and look for
+        * the first WORKGROUP<0x1b> name.
+        */
+
+       if (answers->rdlength > 0) {
+               char *p = answers->rdata;
+               int numnames = CVAL(p, 0);
+
+               p += 1;
+
+               while (numnames--) {
+                       unstring qname;
+                       uint16_t nb_flags;
+                       int name_type;
+
+                       pull_ascii_nstring(qname, sizeof(qname), p);
+                       name_type = CVAL(p,15);
+                       nb_flags = get_nb_flags(&p[16]);
+                       trim_char(qname,'\0',' ');
+
+                       p += 18;
+
+                       if(!(nb_flags & NB_GROUP) && (name_type == 0x00) && 
+                                       server_name[0] == 0) {
+                               /* this is almost certainly the server netbios name */
+                               strlcpy(server_name, qname, sizeof(server_name));
+                               continue;
+                       }
+
+                       if(!(nb_flags & NB_GROUP) && (name_type == 0x1b)) {
+                               struct work_record *work;
+
+                               if( DEBUGLVL( 5 ) ) {
+                                       dbgtext( "get_domain_master_name_node_status_success:\n" );
+                                       dbgtext( "%s(%s) ", server_name, inet_ntoa(from_ip) );
+                                       dbgtext( "is a domain master browser for workgroup " );
+                                       dbgtext( "%s. Adding this name.\n", qname );
+                               }
+
+                               /* 
+                                * If we don't already know about this workgroup, add it
+                                * to the workgroup list on the unicast_subnet.
+                                */
+
+                               work = find_workgroup_on_subnet( subrec, qname);
+                               if (work == NULL) {
+                                       struct nmb_name nmbname;
+                                       /* 
+                                        * Add it - with an hour in the cache.
+                                        */
+                                       work = create_workgroup_on_subnet(subrec, qname, 60*60);
+                                       if (work == NULL) {
+                                               return;
+                                       }
+
+                                       /* remember who the master is */
+                                       strlcpy(work->local_master_browser_name,
+                                               server_name,
+                                               sizeof(work->local_master_browser_name));
+                                       make_nmb_name(&nmbname, server_name, 0x20);
+                                       work->dmb_name = nmbname;
+                                       work->dmb_addr = from_ip;
+                               }
+                               break;
+                       }
+               }
+       } else if( DEBUGLVL( 1 ) ) {
+               dbgtext( "get_domain_master_name_node_status_success:\n" );
+               dbgtext( "Failed to find a WORKGROUP<0x1b> name in reply from IP " );
+               dbgtext( "%s.\n", inet_ntoa(from_ip) );
+       }
 }
 
 /****************************************************************************
@@ -510,13 +492,12 @@ static void get_domain_master_name_node_status_success(struct subnet_record *sub
 static void get_domain_master_name_node_status_fail(struct subnet_record *subrec,
                        struct response_record *rrec)
 {
-  if( DEBUGLVL( 0 ) )
-  {
-    dbgtext( "get_domain_master_name_node_status_fail:\n" );
-    dbgtext( "Doing a node status request to the domain master browser " );
-    dbgtext( "at IP %s failed.\n", inet_ntoa(rrec->packet->ip) );
-    dbgtext( "Cannot get workgroup name.\n" );
-  }
+       if( DEBUGLVL( 2 ) ) {
+               dbgtext( "get_domain_master_name_node_status_fail:\n" );
+               dbgtext( "Doing a node status request to the domain master browser " );
+               dbgtext( "at IP %s failed.\n", inet_ntoa(rrec->packet->ip) );
+               dbgtext( "Cannot get workgroup name.\n" );
+       }
 }
 
 /****************************************************************************
@@ -527,59 +508,53 @@ static void find_all_domain_master_names_query_success(struct subnet_record *sub
                         struct userdata_struct *userdata_in,
                         struct nmb_name *q_name, struct in_addr answer_ip, struct res_rec *rrec)
 {
-  /* 
-   * We now have a list of all the domain master browsers for all workgroups
-   * that have registered with the WINS server. Now do a node status request
-   * to each one and look for the first 1b name in the reply. This will be
-   * the workgroup name that we will add to the unicast subnet as a 'non-local'
-   * workgroup.
-   */
-
-  struct nmb_name nmbname;
-  struct in_addr send_ip;
-  int i;
-
-  if( DEBUGLVL( 5 ) )
-  {
-    dbgtext( "find_all_domain_master_names_query_succes:\n" );
-    dbgtext( "Got answer from WINS server of %d ", (rrec->rdlength / 6) );
-    dbgtext( "IP addresses for Domain Master Browsers.\n" );
-  }
+       /* 
+        * We now have a list of all the domain master browsers for all workgroups
+        * that have registered with the WINS server. Now do a node status request
+        * to each one and look for the first 1b name in the reply. This will be
+        * the workgroup name that we will add to the unicast subnet as a 'non-local'
+        * workgroup.
+        */
+
+       struct nmb_name nmbname;
+       struct in_addr send_ip;
+       int i;
+
+       if( DEBUGLVL( 5 ) ) {
+               dbgtext( "find_all_domain_master_names_query_succes:\n" );
+               dbgtext( "Got answer from WINS server of %d ", (rrec->rdlength / 6) );
+               dbgtext( "IP addresses for Domain Master Browsers.\n" );
+       }
 
-  for(i = 0; i < rrec->rdlength / 6; i++)
-  {
-    /* Initiate the node status requests. */
-    memset((char *)&nmbname, '\0', sizeof(nmbname));
-    nmbname.name[0] = '*';
-
-    putip((char *)&send_ip, (char *)&rrec->rdata[(i*6) + 2]);
-
-    /* 
-     * Don't send node status requests to ourself.
-     */
-
-    if(ismyip( send_ip ))
-    {
-      if( DEBUGLVL( 5 ) )
-      {
-        dbgtext( "find_all_domain_master_names_query_succes:\n" );
-        dbgtext( "Not sending node status to our own IP " );
-        dbgtext( "%s.\n", inet_ntoa(send_ip) );
-      }
-      continue;
-    }
-
-    if( DEBUGLVL( 5 ) )
-    {
-      dbgtext( "find_all_domain_master_names_query_success:\n" );
-      dbgtext( "Sending node status request to IP %s.\n", inet_ntoa(send_ip) );
-    }
-
-    node_status( subrec, &nmbname, send_ip, 
-                 get_domain_master_name_node_status_success,
-                 get_domain_master_name_node_status_fail,
-                 NULL);
-  }
+       for(i = 0; i < rrec->rdlength / 6; i++) {
+               /* Initiate the node status requests. */
+               make_nmb_name(&nmbname, "*", 0);
+
+               putip((char *)&send_ip, (char *)&rrec->rdata[(i*6) + 2]);
+
+               /* 
+                * Don't send node status requests to ourself.
+                */
+
+               if(ismyip_v4( send_ip )) {
+                       if( DEBUGLVL( 5 ) ) {
+                               dbgtext( "find_all_domain_master_names_query_succes:\n" );
+                               dbgtext( "Not sending node status to our own IP " );
+                               dbgtext( "%s.\n", inet_ntoa(send_ip) );
+                       }
+                       continue;
+               }
+
+               if( DEBUGLVL( 5 ) ) {
+                       dbgtext( "find_all_domain_master_names_query_success:\n" );
+                       dbgtext( "Sending node status request to IP %s.\n", inet_ntoa(send_ip) );
+               }
+
+               node_status( subrec, &nmbname, send_ip, 
+                               get_domain_master_name_node_status_success,
+                               get_domain_master_name_node_status_fail,
+                               NULL);
+       }
 }
 
 /****************************************************************************
@@ -589,13 +564,12 @@ static void find_all_domain_master_names_query_fail(struct subnet_record *subrec
                                     struct response_record *rrec,
                                     struct nmb_name *question_name, int fail_code)
 {
-  if( DEBUGLVL( 10 ) )
-  {
-    dbgtext( "find_domain_master_name_query_fail:\n" );
-    dbgtext( "WINS server did not reply to a query for name " );
-    dbgtext( "%s.\nThis means it ", nmb_namestr(question_name) );
-    dbgtext( "is probably not a Samba 1.9.18 or above WINS server.\n" );
-  }
+       if( DEBUGLVL( 10 ) ) {
+               dbgtext( "find_domain_master_name_query_fail:\n" );
+               dbgtext( "WINS server did not reply to a query for name " );
+               dbgtext( "%s.\nThis means it ", nmb_namestr(question_name) );
+               dbgtext( "is probably not a Samba 1.9.18 or above WINS server.\n" );
+       }
 }
 
 /****************************************************************************
@@ -606,43 +580,39 @@ static void find_all_domain_master_names_query_fail(struct subnet_record *subrec
  <1b> name in the reply - this is the workgroup name. Add this to the unicast
  subnet. This is expensive, so we only do this every 15 minutes.
 **************************************************************************/
+
 void collect_all_workgroup_names_from_wins_server(time_t t)
 {
-  static time_t lastrun = 0;
-  struct work_record *work;
-  struct nmb_name nmbname;
-
-  /* Only do this if we are using a WINS server. */
-  if(we_are_a_wins_client() == False)
-    return;
-
-  /* Check to see if we are a domain master browser on the unicast subnet. */
-  if((work = find_workgroup_on_subnet( unicast_subnet, global_myworkgroup)) == NULL)
-  {
-    if( DEBUGLVL( 0 ) )
-    {
-      dbgtext( "collect_all_workgroup_names_from_wins_server:\n" );
-      dbgtext( "Cannot find my workgroup %s ", global_myworkgroup );
-      dbgtext( "on subnet %s.\n", unicast_subnet->subnet_name );
-    }
-    return;
-  }
+       static time_t lastrun = 0;
+       struct work_record *work;
 
-  if(!AM_DOMAIN_MASTER_BROWSER(work))
-    return;
+       /* Only do this if we are using a WINS server. */
+       if(we_are_a_wins_client() == False)
+               return;
 
-  if ((lastrun != 0) && (t < lastrun + (15 * 60)))
-    return;
-     
-  lastrun = t;
+       /* Check to see if we are a domain master browser on the unicast subnet. */
+       if((work = find_workgroup_on_subnet( unicast_subnet, lp_workgroup())) == NULL) {
+               if( DEBUGLVL( 0 ) ) {
+                       dbgtext( "collect_all_workgroup_names_from_wins_server:\n" );
+                       dbgtext( "Cannot find my workgroup %s ", lp_workgroup() );
+                       dbgtext( "on subnet %s.\n", unicast_subnet->subnet_name );
+               }
+               return;
+       }
 
-  make_nmb_name(&nmbname,"*",0x1b,scope);
+       if(!AM_DOMAIN_MASTER_BROWSER(work))
+               return;
 
-  /* First, query for the *<1b> name from the WINS server. */
-  query_name(unicast_subnet, nmbname.name, nmbname.name_type,
-             find_all_domain_master_names_query_success,
-             find_all_domain_master_names_query_fail,
-             NULL);
+       if ((lastrun != 0) && (t < lastrun + (15 * 60)))
+               return;
+     
+       lastrun = t;
+
+       /* First, query for the *<1b> name from the WINS server. */
+       query_name(unicast_subnet, "*", 0x1b,
+               find_all_domain_master_names_query_success,
+               find_all_domain_master_names_query_fail,
+               NULL);
 } 
 
 
@@ -654,6 +624,7 @@ To prevent exponential network traffic with large numbers of workgroups
 we use a randomised system where sync probability is inversely proportional
 to the number of known workgroups
 **************************************************************************/
+
 void sync_all_dmbs(time_t t)
 {
        static time_t lastrun = 0;
@@ -666,8 +637,9 @@ void sync_all_dmbs(time_t t)
 
        /* Check to see if we are a domain master browser on the
            unicast subnet. */
-       work = find_workgroup_on_subnet(unicast_subnet, global_myworkgroup);
-       if (!work) return;
+       work = find_workgroup_on_subnet(unicast_subnet, lp_workgroup());
+       if (!work)
+               return;
 
        if (!AM_DOMAIN_MASTER_BROWSER(work))
                return;
@@ -677,15 +649,23 @@ void sync_all_dmbs(time_t t)
      
        /* count how many syncs we might need to do */
        for (work=unicast_subnet->workgrouplist; work; work = work->next) {
-               if (strcmp(global_myworkgroup, work->work_group)) {
+               if (strcmp(lp_workgroup(), work->work_group)) {
                        count++;
                }
        }
 
+       /* leave if we don't have to do any syncs */
+       if (count == 0) {
+               return;
+       }
+
        /* sync with a probability of 1/count */
        for (work=unicast_subnet->workgrouplist; work; work = work->next) {
-               if (strcmp(global_myworkgroup, work->work_group)) {
-                       if (((unsigned)sys_random()) % count != 0) continue;
+               if (strcmp(lp_workgroup(), work->work_group)) {
+                       unstring dmb_name;
+
+                       if (((unsigned)sys_random()) % count != 0)
+                               continue;
 
                        lastrun = t;
 
@@ -694,16 +674,18 @@ void sync_all_dmbs(time_t t)
                                   the same as the unicast local master */
                                make_nmb_name(&work->dmb_name, 
                                              work->local_master_browser_name,
-                                             0x20, scope);
+                                             0x20);
                        }
 
+                       pull_ascii_nstring(dmb_name, sizeof(dmb_name), work->dmb_name.name);
+
                        DEBUG(3,("Initiating DMB<->DMB sync with %s(%s)\n",
-                                work->dmb_name.name, 
-                                inet_ntoa(work->dmb_addr)));
+                                dmb_name, inet_ntoa(work->dmb_addr)));
+
                        sync_browse_lists(work, 
-                                         work->dmb_name.name,
+                                         dmb_name,
                                          work->dmb_name.name_type, 
                                          work->dmb_addr, False, False);
                }
        }
-} 
+}