s3: nmbd: Stop nmbd network announce storm.
[samba.git] / source3 / nmbd / nmbd_sendannounce.c
index e39e2514966cb3c27d7c475fbc8c68f0d9d35aba..a9cdf1c5a5833a8bd146ea084be9ed3cfc8fa75c 100644 (file)
@@ -1,6 +1,5 @@
 /* 
-   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
@@ -11,7 +10,7 @@
    
    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 "../librpc/gen_ndr/svcctl.h"
+#include "nmbd/nmbd.h"
 
-extern int DEBUGLEVEL;
-extern pstring myname;
-extern fstring myworkgroup;
-extern char **my_netbios_names;
 extern int  updatecount;
-extern BOOL found_lm_clients;
+extern bool found_lm_clients;
 
 /****************************************************************************
  Send a browser reset packet.
 **************************************************************************/
 
-void send_browser_reset(int reset_type, char *to_name, int to_type, struct in_addr to_ip)
+void send_browser_reset(int reset_type, const char *to_name, int to_type, struct in_addr to_ip)
 {
-  pstring outbuf;
-  char *p;
-
-  DEBUG(3,("send_browser_reset: sending reset request type %d to %s<%02x> IP %s.\n",
-       reset_type, to_name, to_type, inet_ntoa(to_ip) ));
-
-  bzero(outbuf,sizeof(outbuf));
-  p = outbuf;
-  CVAL(p,0) = ANN_ResetBrowserState;
-  p++;
-  CVAL(p,0) = reset_type;
-  p++;
-
-  send_mailslot(True, BROWSE_MAILSLOT, outbuf,PTR_DIFF(p,outbuf),
-                myname, 0x0, to_name, to_type, to_ip, FIRST_SUBNET->myip);
+       char outbuf[1024];
+       char *p;
+
+       DEBUG(3,("send_browser_reset: sending reset request type %d to %s<%02x> IP %s.\n",
+               reset_type, to_name, to_type, inet_ntoa(to_ip) ));
+
+       memset(outbuf,'\0',sizeof(outbuf));
+       p = outbuf;
+       SCVAL(p,0,ANN_ResetBrowserState);
+       p++;
+       SCVAL(p,0,reset_type);
+       p++;
+
+       send_mailslot(True, BROWSE_MAILSLOT, outbuf,PTR_DIFF(p,outbuf),
+               lp_netbios_name(), 0x0, to_name, to_type, to_ip,
+               FIRST_SUBNET->myip, DGRAM_PORT);
 }
 
 /****************************************************************************
@@ -64,27 +61,26 @@ void send_browser_reset(int reset_type, char *to_name, int to_type, struct in_ad
 
 void broadcast_announce_request(struct subnet_record *subrec, struct work_record *work)
 {
-  pstring outbuf;
-  char *p;
+       char outbuf[1024];
+       char *p;
 
-  work->needannounce = True;
+       work->needannounce = True;
 
-  DEBUG(3,("broadcast_announce_request: sending announce request for workgroup %s \
+       DEBUG(3,("broadcast_announce_request: sending announce request for workgroup %s \
 to subnet %s\n", work->work_group, subrec->subnet_name));
 
-  bzero(outbuf,sizeof(outbuf));
-  p = outbuf;
-  CVAL(p,0) = ANN_AnnouncementRequest;
-  p++;
+       memset(outbuf,'\0',sizeof(outbuf));
+       p = outbuf;
+       SCVAL(p,0,ANN_AnnouncementRequest);
+       p++;
 
-  CVAL(p,0) = work->token; /* (local) Unique workgroup token id. */
-  p++;
-  StrnCpy(p,myname,15);
-  strupper(p);
-  p = skip_string(p,1);
+       SCVAL(p,0,work->token); /* (local) Unique workgroup token id. */
+       p++;
+       p +=  push_string_check(p+1, lp_netbios_name(), 15, STR_ASCII|STR_UPPER|STR_TERMINATE);
   
-  send_mailslot(False, BROWSE_MAILSLOT, outbuf,PTR_DIFF(p,outbuf),
-                myname, 0x0, work->work_group,0x1e, subrec->bcast_ip, subrec->myip);
+       send_mailslot(False, BROWSE_MAILSLOT, outbuf,PTR_DIFF(p,outbuf),
+               lp_netbios_name(), 0x0, work->work_group,0x1e, subrec->bcast_ip,
+               subrec->myip, DGRAM_PORT);
 }
 
 /****************************************************************************
@@ -92,39 +88,43 @@ to subnet %s\n", work->work_group, subrec->subnet_name));
   **************************************************************************/
 
 static void send_announcement(struct subnet_record *subrec, int announce_type,
-                              char *from_name, char *to_name, int to_type, struct in_addr to_ip,
+                              const char *from_name, const char *to_name, int to_type, struct in_addr to_ip,
                               time_t announce_interval,
-                              char *server_name, int server_type, char *server_comment)
+                              const char *server_name, int server_type, const char *server_comment)
 {
-  pstring outbuf;
-  char *p;
+       char outbuf[1024];
+       unstring upper_server_name;
+       char *p;
 
-  bzero(outbuf,sizeof(outbuf));
-  p = outbuf+1;
+       memset(outbuf,'\0',sizeof(outbuf));
+       p = outbuf+1;
 
-  CVAL(outbuf,0) = announce_type;
+       SCVAL(outbuf,0,announce_type);
 
-  /* Announcement parameters. */
-  CVAL(p,0) = updatecount;
-  SIVAL(p,1,announce_interval*1000); /* Milliseconds - despite the spec. */
+       /* Announcement parameters. */
+       SCVAL(p,0,updatecount);
+       SIVAL(p,1,announce_interval*1000); /* Milliseconds - despite the spec. */
 
-  StrnCpy(p+5,server_name,15);
-  strupper(p+5);
+       strlcpy(upper_server_name, server_name ? server_name : "", sizeof(upper_server_name));
+       if (!strupper_m(upper_server_name)) {
+               DEBUG(2,("strupper_m %s failed\n", upper_server_name));
+               return;
+       }
+       push_string_check(p+5, upper_server_name, 16, STR_ASCII|STR_TERMINATE);
 
-  CVAL(p,21) = lp_major_announce_version(); /* Major version. */
-  CVAL(p,22) = lp_minor_announce_version(); /* Minor version. */
+       SCVAL(p,21,SAMBA_MAJOR_NBT_ANNOUNCE_VERSION); /* Major version. */
+       SCVAL(p,22,SAMBA_MINOR_NBT_ANNOUNCE_VERSION); /* Minor version. */
 
-  SIVAL(p,23,server_type & ~SV_TYPE_LOCAL_LIST_ONLY);
-  /* Browse version: got from NT/AS 4.00  - Value defined in smb.h (JHT). */
-  SSVAL(p,27,BROWSER_ELECTION_VERSION);
-  SSVAL(p,29,BROWSER_CONSTANT); /* Browse signature. */
+       SIVAL(p,23,server_type & ~SV_TYPE_LOCAL_LIST_ONLY);
+       /* Browse version: got from NT/AS 4.00  - Value defined in smb.h (JHT). */
+       SSVAL(p,27,BROWSER_ELECTION_VERSION);
+       SSVAL(p,29,BROWSER_CONSTANT); /* Browse signature. */
 
-  pstrcpy(p+31,server_comment);
-  p += 31;
-  p = skip_string(p,1);
+       p += 31 + push_string_check(p+31, server_comment, sizeof(outbuf) - (p + 31 - outbuf), STR_ASCII|STR_TERMINATE);
 
-  send_mailslot(False,BROWSE_MAILSLOT, outbuf, PTR_DIFF(p,outbuf),
-                from_name, 0x0, to_name, to_type, to_ip, subrec->myip);
+       send_mailslot(False,BROWSE_MAILSLOT, outbuf, PTR_DIFF(p,outbuf),
+                       from_name, 0x0, to_name, to_type, to_ip, subrec->myip,
+                       DGRAM_PORT);
 }
 
 /****************************************************************************
@@ -136,26 +136,24 @@ static void send_lm_announcement(struct subnet_record *subrec, int announce_type
                               time_t announce_interval,
                               char *server_name, int server_type, char *server_comment)
 {
-  pstring outbuf;
-  char *p=outbuf;
-
-  bzero(outbuf,sizeof(outbuf));
-
-  SSVAL(p,0,announce_type);
-  SIVAL(p,2,server_type & ~SV_TYPE_LOCAL_LIST_ONLY);
-  CVAL(p,6) = lp_major_announce_version(); /* Major version. */
-  CVAL(p,7) = lp_minor_announce_version(); /* Minor version. */
-  SSVAL(p,8,announce_interval);            /* In seconds - according to spec. */
-
-  p += 10;
-  StrnCpy(p,server_name,15);
-  strupper(p);
-  p = skip_string(p,1);
-  pstrcpy(p,server_comment);
-  p = skip_string(p,1);
-
-  send_mailslot(False,LANMAN_MAILSLOT, outbuf, PTR_DIFF(p,outbuf),
-                from_name, 0x0, to_name, to_type, to_ip, subrec->myip);
+       char outbuf[1024];
+       char *p=outbuf;
+
+       memset(outbuf,'\0',sizeof(outbuf));
+
+       SSVAL(p,0,announce_type);
+       SIVAL(p,2,server_type & ~SV_TYPE_LOCAL_LIST_ONLY);
+       SCVAL(p,6,SAMBA_MAJOR_NBT_ANNOUNCE_VERSION); /* Major version. */
+       SCVAL(p,7,SAMBA_MINOR_NBT_ANNOUNCE_VERSION); /* Minor version. */
+       SSVAL(p,8,announce_interval);            /* In seconds - according to spec. */
+
+       p += 10;
+       p += push_string_check(p, server_name, 15, STR_ASCII|STR_UPPER|STR_TERMINATE);
+       p += push_string_check(p, server_comment, sizeof(outbuf)- (p - outbuf), STR_ASCII|STR_UPPER|STR_TERMINATE);
+
+       send_mailslot(False,LANMAN_MAILSLOT, outbuf, PTR_DIFF(p,outbuf),
+               from_name, 0x0, to_name, to_type, to_ip, subrec->myip,
+               DGRAM_PORT);
 }
 
 /****************************************************************************
@@ -165,20 +163,20 @@ static void send_lm_announcement(struct subnet_record *subrec, int announce_type
 static void send_local_master_announcement(struct subnet_record *subrec, struct work_record *work,
                                            struct server_record *servrec)
 {
-  /* Ensure we don't have the prohibited bit set. */
-  uint32 type = servrec->serv.type & ~SV_TYPE_LOCAL_LIST_ONLY;
-
-  DEBUG(3,("send_local_master_announcement: type %x for name %s on subnet %s for workgroup %s\n",
-            type, myname, subrec->subnet_name, work->work_group));
-
-  send_announcement(subrec, ANN_LocalMasterAnnouncement,
-                    myname,                          /* From nbt name. */
-                    work->work_group, 0x1e,          /* To nbt name. */
-                    subrec->bcast_ip,                /* To ip. */
-                    work->announce_interval,         /* Time until next announce. */
-                    myname,                          /* Name to announce. */
-                    type,                            /* Type field. */
-                    servrec->serv.comment);
+       /* Ensure we don't have the prohibited bit set. */
+       uint32_t type = servrec->serv.type & ~SV_TYPE_LOCAL_LIST_ONLY;
+
+       DEBUG(3,("send_local_master_announcement: type %x for name %s on subnet %s for workgroup %s\n",
+               type, lp_netbios_name(), subrec->subnet_name, work->work_group));
+
+       send_announcement(subrec, ANN_LocalMasterAnnouncement,
+                       lp_netbios_name(),                 /* From nbt name. */
+                       work->work_group, 0x1e,          /* To nbt name. */
+                       subrec->bcast_ip,                /* To ip. */
+                       work->announce_interval,         /* Time until next announce. */
+                       lp_netbios_name(),                 /* Name to announce. */
+                       type,                            /* Type field. */
+                       servrec->serv.comment);
 }
 
 /****************************************************************************
@@ -187,17 +185,17 @@ static void send_local_master_announcement(struct subnet_record *subrec, struct
 
 static void send_workgroup_announcement(struct subnet_record *subrec, struct work_record *work)
 {
-  DEBUG(3,("send_workgroup_announcement: on subnet %s for workgroup %s\n",
-            subrec->subnet_name, work->work_group));
-
-  send_announcement(subrec, ANN_DomainAnnouncement,
-                    myname,                          /* From nbt name. */
-                    MSBROWSE, 0x1,                   /* To nbt name. */
-                    subrec->bcast_ip,                /* To ip. */
-                    work->announce_interval,         /* Time until next announce. */
-                    work->work_group,                /* Name to announce. */
-                    SV_TYPE_DOMAIN_ENUM|SV_TYPE_NT,  /* workgroup announce flags. */
-                    myname);                         /* From name as comment. */
+       DEBUG(3,("send_workgroup_announcement: on subnet %s for workgroup %s\n",
+               subrec->subnet_name, work->work_group));
+
+       send_announcement(subrec, ANN_DomainAnnouncement,
+                       lp_netbios_name(),                 /* From nbt name. */
+                       MSBROWSE, 0x1,                   /* To nbt name. */
+                       subrec->bcast_ip,                /* To ip. */
+                       work->announce_interval,         /* Time until next announce. */
+                       work->work_group,                /* Name to announce. */
+                       SV_TYPE_DOMAIN_ENUM|SV_TYPE_NT,  /* workgroup announce flags. */
+                       lp_netbios_name());                /* From name as comment. */
 }
 
 /****************************************************************************
@@ -207,20 +205,20 @@ static void send_workgroup_announcement(struct subnet_record *subrec, struct wor
 static void send_host_announcement(struct subnet_record *subrec, struct work_record *work,
                                    struct server_record *servrec)
 {
-  /* Ensure we don't have the prohibited bits set. */
-  uint32 type = servrec->serv.type & ~SV_TYPE_LOCAL_LIST_ONLY;
-
-  DEBUG(3,("send_host_announcement: type %x for host %s on subnet %s for workgroup %s\n",
-            type, servrec->serv.name, subrec->subnet_name, work->work_group));
-
-  send_announcement(subrec, ANN_HostAnnouncement,
-                    servrec->serv.name,              /* From nbt name. */
-                    work->work_group, 0x1d,          /* To nbt name. */
-                    subrec->bcast_ip,                /* To ip. */
-                    work->announce_interval,         /* Time until next announce. */
-                    servrec->serv.name,              /* Name to announce. */
-                    type,                            /* Type field. */
-                    servrec->serv.comment);
+       /* Ensure we don't have the prohibited bits set. */
+       uint32_t type = servrec->serv.type & ~SV_TYPE_LOCAL_LIST_ONLY;
+
+       DEBUG(3,("send_host_announcement: type %x for host %s on subnet %s for workgroup %s\n",
+               type, servrec->serv.name, subrec->subnet_name, work->work_group));
+
+       send_announcement(subrec, ANN_HostAnnouncement,
+                       servrec->serv.name,              /* From nbt name. */
+                       work->work_group, 0x1d,          /* To nbt name. */
+                       subrec->bcast_ip,                /* To ip. */
+                       work->announce_interval,         /* Time until next announce. */
+                       servrec->serv.name,              /* Name to announce. */
+                       type,                            /* Type field. */
+                       servrec->serv.comment);
 }
 
 /****************************************************************************
@@ -230,20 +228,20 @@ static void send_host_announcement(struct subnet_record *subrec, struct work_rec
 static void send_lm_host_announcement(struct subnet_record *subrec, struct work_record *work,
                                    struct server_record *servrec, int lm_interval)
 {
-  /* Ensure we don't have the prohibited bits set. */
-  uint32 type = servrec->serv.type & ~SV_TYPE_LOCAL_LIST_ONLY;
-
-  DEBUG(3,("send_lm_host_announcement: type %x for host %s on subnet %s for workgroup %s, ttl: %d\n",
-            type, servrec->serv.name, subrec->subnet_name, work->work_group, lm_interval));
-
-  send_lm_announcement(subrec, ANN_HostAnnouncement,
-                    servrec->serv.name,              /* From nbt name. */
-                    work->work_group, 0x00,          /* To nbt name. */
-                    subrec->bcast_ip,                /* To ip. */
-                    lm_interval,                     /* Time until next announce. */
-                    servrec->serv.name,              /* Name to announce. */
-                    type,                            /* Type field. */
-                    servrec->serv.comment);
+       /* Ensure we don't have the prohibited bits set. */
+       uint32_t type = servrec->serv.type & ~SV_TYPE_LOCAL_LIST_ONLY;
+
+       DEBUG(3,("send_lm_host_announcement: type %x for host %s on subnet %s for workgroup %s, ttl: %d\n",
+               type, servrec->serv.name, subrec->subnet_name, work->work_group, lm_interval));
+
+       send_lm_announcement(subrec, ANN_HostAnnouncement,
+                       servrec->serv.name,              /* From nbt name. */
+                       work->work_group, 0x00,          /* To nbt name. */
+                       subrec->bcast_ip,                /* To ip. */
+                       lm_interval,                     /* Time until next announce. */
+                       servrec->serv.name,              /* Name to announce (fstring not netbios name struct). */
+                       type,                            /* Type field. */
+                       servrec->serv.comment);
 }
 
 /****************************************************************************
@@ -253,18 +251,15 @@ static void send_lm_host_announcement(struct subnet_record *subrec, struct work_
 static void announce_server(struct subnet_record *subrec, struct work_record *work,
                      struct server_record *servrec)
 {
-  /* Only do domain announcements if we are a master and it's
-     our primary name we're being asked to announce. */
-
-  if (AM_LOCAL_MASTER_BROWSER(work) && strequal(myname,servrec->serv.name))
-  {
-    send_local_master_announcement(subrec, work, servrec);
-    send_workgroup_announcement(subrec, work);
-  }
-  else
-  {
-    send_host_announcement(subrec, work, servrec);
-  }
+       /* Only do domain announcements if we are a master and it's
+               our primary name we're being asked to announce. */
+
+       if (AM_LOCAL_MASTER_BROWSER(work) && strequal(lp_netbios_name(),servrec->serv.name)) {
+               send_local_master_announcement(subrec, work, servrec);
+               send_workgroup_announcement(subrec, work);
+       } else {
+               send_host_announcement(subrec, work, servrec);
+       }
 }
 
 /****************************************************************************
@@ -274,43 +269,41 @@ static void announce_server(struct subnet_record *subrec, struct work_record *wo
 
 void announce_my_server_names(time_t t)
 {
-  struct subnet_record *subrec;
-
-  for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec))
-  {
-    struct work_record *work = find_workgroup_on_subnet(subrec, myworkgroup);
-
-    if(work)
-    {
-      struct server_record *servrec;
-
-      if (work->needannounce)
-      {
-        /* Drop back to a max 3 minute announce. This is to prevent a
-           single lost packet from breaking things for too long. */
-
-        work->announce_interval = MIN(work->announce_interval,
-                                    CHECK_TIME_MIN_HOST_ANNCE*60);
-        work->lastannounce_time = t - (work->announce_interval+1);
-        work->needannounce = False;
-      }
-
-      /* Announce every minute at first then progress to every 12 mins */
-      if ((t - work->lastannounce_time) < work->announce_interval)
-        continue;
-
-      if (work->announce_interval < (CHECK_TIME_MAX_HOST_ANNCE * 60))
-        work->announce_interval += 60;
-
-      work->lastannounce_time = t;
-
-      for (servrec = work->serverlist; servrec; servrec = servrec->next)
-      {
-        if (is_myname(servrec->serv.name))
-          announce_server(subrec, work, servrec);
-      }
-    } /* if work */
-  } /* for subrec */
+       struct subnet_record *subrec;
+
+       for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
+               struct work_record *work = find_workgroup_on_subnet(subrec, lp_workgroup());
+
+               if(work) {
+                       struct server_record *servrec;
+
+                       if (work->needannounce) {
+                               /* Drop back to a max 3 minute announce. This is to prevent a
+                                       single lost packet from breaking things for too long. */
+
+                               work->announce_interval = MIN(work->announce_interval,
+                                                       CHECK_TIME_MIN_HOST_ANNCE*60);
+                               work->lastannounce_time = t - (work->announce_interval+1);
+                               work->needannounce = False;
+                       }
+
+                       /* Announce every minute at first then progress to every 12 mins */
+                       if (t >= work->lastannounce_time &&
+                           (t - work->lastannounce_time) < work->announce_interval) {
+                               continue;
+                       }
+
+                       if (work->announce_interval < (CHECK_TIME_MAX_HOST_ANNCE * 60))
+                               work->announce_interval += 60;
+
+                       work->lastannounce_time = t;
+
+                       for (servrec = work->serverlist; servrec; servrec = servrec->next) {
+                               if (is_myname(servrec->serv.name))
+                                       announce_server(subrec, work, servrec);
+                       }
+               } /* if work */
+       } /* for subrec */
 }
 
 /****************************************************************************
@@ -320,47 +313,42 @@ void announce_my_server_names(time_t t)
 
 void announce_my_lm_server_names(time_t t)
 {
-  struct subnet_record *subrec;
-  static time_t last_lm_announce_time=0;
-  int announce_interval = lp_lm_interval();
-  int lm_announce = lp_lm_announce();
-
-  if ((announce_interval <= 0) || (lm_announce <= 0))
-  {
-    /* user absolutely does not want LM announcements to be sent. */
-    return;
-  }
-
-  if ((lm_announce >= 2) && (!found_lm_clients))
-  {
-    /* has been set to 2 (Auto) but no LM clients detected (yet). */
-    return;
-  }
-
-  /* Otherwise: must have been set to 1 (Yes), or LM clients *have*
-     been detected. */
-
-  for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec))
-  {
-    struct work_record *work = find_workgroup_on_subnet(subrec, myworkgroup);
-
-    if(work)
-    {
-      struct server_record *servrec;
-
-      if (last_lm_announce_time && ((t - last_lm_announce_time) < announce_interval ))
-        continue;
-
-      last_lm_announce_time = t;
-
-      for (servrec = work->serverlist; servrec; servrec = servrec->next)
-      {
-        if (is_myname(servrec->serv.name))
-          /* skipping equivalent of announce_server() */
-          send_lm_host_announcement(subrec, work, servrec, announce_interval);
-      }
-    } /* if work */
-  } /* for subrec */
+       struct subnet_record *subrec;
+       static time_t last_lm_announce_time=0;
+       int announce_interval = lp_lm_interval();
+       int lm_announce = lp_lm_announce();
+
+       if ((announce_interval <= 0) || (lm_announce <= 0)) {
+               /* user absolutely does not want LM announcements to be sent. */
+               return;
+       }
+
+       if ((lm_announce >= 2) && (!found_lm_clients)) {
+               /* has been set to 2 (Auto) but no LM clients detected (yet). */
+               return;
+       }
+
+       /* Otherwise: must have been set to 1 (Yes), or LM clients *have*
+               been detected. */
+
+       for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
+               struct work_record *work = find_workgroup_on_subnet(subrec, lp_workgroup());
+
+               if(work) {
+                       struct server_record *servrec;
+
+                       if (last_lm_announce_time && ((t - last_lm_announce_time) < announce_interval ))
+                               continue;
+
+                       last_lm_announce_time = t;
+
+                       for (servrec = work->serverlist; servrec; servrec = servrec->next) {
+                               if (is_myname(servrec->serv.name))
+                                       /* skipping equivalent of announce_server() */
+                                       send_lm_host_announcement(subrec, work, servrec, announce_interval);
+                       }
+               } /* if work */
+       } /* for subrec */
 }
 
 /* Announce timer. Moved into global static so it can be reset
@@ -372,9 +360,9 @@ static time_t announce_timer_last=0;
  immediately.
  ****************************************************************************/
 
-void reset_announce_timer()
+void reset_announce_timer(void)
 {
-  announce_timer_last = time(NULL) - (CHECK_TIME_MST_ANNOUNCE * 60);
+       announce_timer_last = time(NULL) - (CHECK_TIME_MST_ANNOUNCE * 60);
 }
 
 /****************************************************************************
@@ -383,44 +371,40 @@ void reset_announce_timer()
 
 void announce_myself_to_domain_master_browser(time_t t)
 {
-  struct subnet_record *subrec;
-  struct work_record *work;
-
-  if(!we_are_a_wins_client())
-  {
-    DEBUG(10,("announce_myself_to_domain_master_browser: no unicast subnet, ignoring.\n"));
-    return;
-  }
-
-  if (!announce_timer_last)
-    announce_timer_last = t;
-
-  if ((t-announce_timer_last) < (CHECK_TIME_MST_ANNOUNCE * 60))
-  {
-    DEBUG(10,("announce_myself_to_domain_master_browser: t (%d) - last(%d) < %d\n",
-               t, announce_timer_last, CHECK_TIME_MST_ANNOUNCE * 60 ));
-    return;
-  }
-
-  announce_timer_last = t;
-
-  /* Look over all our broadcast subnets to see if any of them
-     has the state set as local master browser. */
-
-  for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec))
-  {
-    for (work = subrec->workgrouplist; work; work = work->next)
-    {
-      if (AM_LOCAL_MASTER_BROWSER(work))
-      {
-        DEBUG(4,( "announce_myself_to_domain_master_browser: I am a local master browser for \
+       struct subnet_record *subrec;
+       struct work_record *work;
+
+       if(!we_are_a_wins_client()) {
+               DEBUG(10,("announce_myself_to_domain_master_browser: no unicast subnet, ignoring.\n"));
+               return;
+       }
+
+       if (!announce_timer_last)
+               announce_timer_last = t;
+
+       if ((t-announce_timer_last) < (CHECK_TIME_MST_ANNOUNCE * 60)) {
+               DEBUG(10,("announce_myself_to_domain_master_browser: t (%d) - last(%d) < %d\n",
+                       (int)t, (int)announce_timer_last, 
+                       CHECK_TIME_MST_ANNOUNCE * 60 ));
+               return;
+       }
+
+       announce_timer_last = t;
+
+       /* Look over all our broadcast subnets to see if any of them
+               has the state set as local master browser. */
+
+       for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
+               for (work = subrec->workgrouplist; work; work = work->next) {
+                       if (AM_LOCAL_MASTER_BROWSER(work)) {
+                               DEBUG(4,( "announce_myself_to_domain_master_browser: I am a local master browser for \
 workgroup %s on subnet %s\n", work->work_group, subrec->subnet_name));
 
-        /* Look in nmbd_browsersync.c for the rest of this code. */
-        announce_and_sync_with_domain_master_browser(subrec, work);
-      }
-    }
-  }
+                               /* Look in nmbd_browsersync.c for the rest of this code. */
+                               announce_and_sync_with_domain_master_browser(subrec, work);
+                       }
+               }
+       }
 }
 
 /****************************************************************************
@@ -430,49 +414,43 @@ This must *only* be called on shutdown.
 
 void announce_my_servers_removed(void)
 {
-  int announce_interval = lp_lm_interval();
-  int lm_announce = lp_lm_announce();
-  struct subnet_record *subrec; 
-
-  for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec))
-  {
-    struct work_record *work;
-    for (work = subrec->workgrouplist; work; work = work->next)
-    {
-      struct server_record *servrec;
-
-      work->announce_interval = 0;
-      for (servrec = work->serverlist; servrec; servrec = servrec->next)
-      {
-        if (!is_myname(servrec->serv.name))
-          continue;
-        servrec->serv.type = 0;
-        if(AM_LOCAL_MASTER_BROWSER(work))
-          send_local_master_announcement(subrec, work, servrec);
-        send_host_announcement(subrec, work, servrec);
-
-
-        if ((announce_interval <= 0) || (lm_announce <= 0))
-        {
-          /* user absolutely does not want LM announcements to be sent. */
-          continue;
-        }
-
-        if ((lm_announce >= 2) && (!found_lm_clients))
-        {
-          /* has been set to 2 (Auto) but no LM clients detected (yet). */
-          continue;
-        }
-
-        /* 
-         * lm announce was set or we have seen lm announcements, so do
-         * a lm announcement of host removed.
-         */
-
-        send_lm_host_announcement(subrec, work, servrec, 0);
-      }
-    }
-  }
+       int announce_interval = lp_lm_interval();
+       int lm_announce = lp_lm_announce();
+       struct subnet_record *subrec; 
+
+       for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
+               struct work_record *work;
+               for (work = subrec->workgrouplist; work; work = work->next) {
+                       struct server_record *servrec;
+
+                       work->announce_interval = 0;
+                       for (servrec = work->serverlist; servrec; servrec = servrec->next) {
+                               if (!is_myname(servrec->serv.name))
+                                       continue;
+                               servrec->serv.type = 0;
+                               if(AM_LOCAL_MASTER_BROWSER(work))
+                                       send_local_master_announcement(subrec, work, servrec);
+                               send_host_announcement(subrec, work, servrec);
+
+                               if ((announce_interval <= 0) || (lm_announce <= 0)) {
+                                       /* user absolutely does not want LM announcements to be sent. */
+                                       continue;
+                               }
+
+                               if ((lm_announce >= 2) && (!found_lm_clients)) {
+                                       /* has been set to 2 (Auto) but no LM clients detected (yet). */
+                                       continue;
+                               }
+
+                               /* 
+                                * lm announce was set or we have seen lm announcements, so do
+                                * a lm announcement of host removed.
+                                */
+
+                               send_lm_host_announcement(subrec, work, servrec, 0);
+                       }
+               }
+       }
 }
 
 /****************************************************************************
@@ -483,123 +461,137 @@ void announce_my_servers_removed(void)
 
 void announce_remote(time_t t)
 {
-  char *s,*ptr;
-  static time_t last_time = 0;
-  pstring s2;
-  struct in_addr addr;
-  char *comment;
-  int stype = lp_default_server_announce();
-
-  if (last_time && (t < (last_time + REMOTE_ANNOUNCE_INTERVAL)))
-    return;
-
-  last_time = t;
-
-  s = lp_remote_announce();
-  if (!*s)
-    return;
-
-  comment = lp_serverstring();
-
-  for (ptr=s; next_token(&ptr,s2,NULL); ) 
-  {
-    /* The entries are of the form a.b.c.d/WORKGROUP with 
-       WORKGROUP being optional */
-    char *wgroup;
-    int i;
-
-    wgroup = strchr(s2,'/');
-    if (wgroup)
-      *wgroup++ = 0;
-    if (!wgroup || !*wgroup)
-      wgroup = myworkgroup;
-
-    addr = *interpret_addr2(s2);
-    
-    /* Announce all our names including aliases */
-    /* Give the ip address as the address of our first
-       broadcast subnet. */
-
-    for(i=0; my_netbios_names[i]; i++) 
-    {
-      char *name = my_netbios_names[i];
-
-      DEBUG(5,("announce_remote: Doing remote announce for server %s to IP %s.\n",
-                 name, inet_ntoa(addr) ));
-
-      send_announcement(FIRST_SUBNET, ANN_HostAnnouncement,
-                    name,                      /* From nbt name. */
-                    wgroup, 0x1d,              /* To nbt name. */
-                    addr,                      /* To ip. */
-                    REMOTE_ANNOUNCE_INTERVAL,  /* Time until next announce. */
-                    name,                      /* Name to announce. */
-                    stype,                     /* Type field. */
-                    comment);
-    }
-  }
+       char *s;
+       const char *ptr;
+       static time_t last_time = 0;
+       char *s2;
+       struct in_addr addr;
+       char *comment;
+       int stype = lp_default_server_announce();
+       TALLOC_CTX *frame = NULL;
+
+       if (last_time && (t < (last_time + REMOTE_ANNOUNCE_INTERVAL)))
+               return;
+
+       last_time = t;
+
+       s = lp_remote_announce(talloc_tos());
+       if (!*s)
+               return;
+
+       comment = string_truncate(lp_server_string(talloc_tos()),
+                                 MAX_SERVER_STRING_LENGTH);
+
+       frame = talloc_stackframe();
+       for (ptr=s; next_token_talloc(frame,&ptr,&s2,NULL); ) {
+               /* The entries are of the form a.b.c.d/WORKGROUP with
+                               WORKGROUP being optional */
+               const char *wgroup;
+               char *pwgroup;
+               int i;
+
+               pwgroup = strchr_m(s2,'/');
+               if (pwgroup)
+                       *pwgroup++ = 0;
+               if (!pwgroup || !*pwgroup)
+                       wgroup = lp_workgroup();
+               else
+                       wgroup = pwgroup;
+
+               addr = interpret_addr2(s2);
+
+               /* Announce all our names including aliases */
+               /* Give the ip address as the address of our first
+                               broadcast subnet. */
+
+               for(i=0; my_netbios_names(i); i++) {
+                       const char *name = my_netbios_names(i);
+
+                       DEBUG(5,("announce_remote: Doing remote announce for server %s to IP %s.\n",
+                               name, inet_ntoa(addr) ));
+
+                       send_announcement(FIRST_SUBNET, ANN_HostAnnouncement,
+                                               name,                      /* From nbt name. */
+                                               wgroup, 0x1d,              /* To nbt name. */
+                                               addr,                      /* To ip. */
+                                               REMOTE_ANNOUNCE_INTERVAL,  /* Time until next announce. */
+                                               name,                      /* Name to announce. */
+                                               stype,                     /* Type field. */
+                                               comment);
+               }
+       }
+       TALLOC_FREE(frame);
 }
 
 /****************************************************************************
   Implement the 'remote browse sync' feature Andrew added.
   These are used to put our browse lists into remote browse lists.
-  **************************************************************************/
+**************************************************************************/
 
 void browse_sync_remote(time_t t)
-{  
-  char *s,*ptr;
-  static time_t last_time = 0; 
-  pstring s2;
-  struct in_addr addr;
-  struct work_record *work;
-  pstring outbuf;
-  char *p;
-  if (last_time && (t < (last_time + REMOTE_ANNOUNCE_INTERVAL)))
-    return;
-   
-  last_time = t;
-
-  s = lp_remote_browse_sync();
-  if (!*s)
-    return;
-
-  /*
-   * We only do this if we are the local master browser
-   * for our workgroup on the firsst subnet.
-   */
-
-  if((work = find_workgroup_on_subnet(FIRST_SUBNET, myworkgroup)) == NULL)
-  {   
-    DEBUG(0,("browse_sync_remote: Cannot find workgroup %s on subnet %s\n",
-           myworkgroup, FIRST_SUBNET->subnet_name ));
-    return;
-  }   
-         
-  if(!AM_LOCAL_MASTER_BROWSER(work))
-  {
-    DEBUG(5,("browse_sync_remote: We can only do this if we are a local master browser \
-for workgroup %s on subnet %s.\n", myworkgroup, FIRST_SUBNET->subnet_name ));
-    return;
-  } 
-
-  bzero(outbuf,sizeof(outbuf));
-  p = outbuf;
-  CVAL(p,0) = ANN_MasterAnnouncement;
-  p++;
-
-  StrnCpy(p,myname,15);
-  strupper(p);
-  p = skip_string(p,1);
-
-  for (ptr=s; next_token(&ptr,s2,NULL); ) 
-  {
-    /* The entries are of the form a.b.c.d */
-    addr = *interpret_addr2(s2);
-
-    DEBUG(5,("announce_remote: Doing remote browse sync announce for server %s to IP %s.\n",
-                 myname, inet_ntoa(addr) ));
-
-    send_mailslot(True, BROWSE_MAILSLOT, outbuf,PTR_DIFF(p,outbuf),
-          myname, 0x0, "*", 0x0, addr, FIRST_SUBNET->myip);
-  }
+{
+       char *s;
+       const char *ptr;
+       static time_t last_time = 0;
+       char *s2;
+       struct in_addr addr;
+       struct work_record *work;
+       char outbuf[1024];
+       char *p;
+       unstring myname;
+       TALLOC_CTX *frame = NULL;
+
+       if (last_time && (t < (last_time + REMOTE_ANNOUNCE_INTERVAL)))
+               return;
+
+       last_time = t;
+
+       s = lp_remote_browse_sync(talloc_tos());
+       if (!*s)
+               return;
+
+       /*
+        * We only do this if we are the local master browser
+        * for our workgroup on the firsst subnet.
+        */
+
+       if((work = find_workgroup_on_subnet(FIRST_SUBNET, lp_workgroup())) == NULL) {   
+               DEBUG(0,("browse_sync_remote: Cannot find workgroup %s on subnet %s\n",
+                       lp_workgroup(), FIRST_SUBNET->subnet_name ));
+               return;
+       }
+
+       if(!AM_LOCAL_MASTER_BROWSER(work)) {
+               DEBUG(5,("browse_sync_remote: We can only do this if we are a local master browser \
+for workgroup %s on subnet %s.\n", lp_workgroup(), FIRST_SUBNET->subnet_name ));
+               return;
+       }
+
+       memset(outbuf,'\0',sizeof(outbuf));
+       p = outbuf;
+       SCVAL(p,0,ANN_MasterAnnouncement);
+       p++;
+
+       unstrcpy(myname, lp_netbios_name());
+       if (!strupper_m(myname)) {
+               DEBUG(2,("strupper_m %s failed\n", myname));
+               return;
+       }
+       myname[15]='\0';
+       push_ascii(p, myname, sizeof(outbuf)-PTR_DIFF(p,outbuf)-1, STR_TERMINATE);
+
+       p = skip_string(outbuf,sizeof(outbuf),p);
+
+       frame = talloc_stackframe();
+       for (ptr=s; next_token_talloc(frame,&ptr,&s2,NULL); ) {
+               /* The entries are of the form a.b.c.d */
+               addr = interpret_addr2(s2);
+
+               DEBUG(5,("announce_remote: Doing remote browse sync announce for server %s to IP %s.\n",
+                       lp_netbios_name(), inet_ntoa(addr) ));
+
+               send_mailslot(True, BROWSE_MAILSLOT, outbuf,PTR_DIFF(p,outbuf),
+                       lp_netbios_name(), 0x0, "*", 0x0, addr, FIRST_SUBNET->myip, DGRAM_PORT);
+       }
+       TALLOC_FREE(frame);
 }