This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to...

[sfrench/samba-autobuild/.git] / source3 / nmbd / nmbd_workgroupdb.c

diff --git a/source3/nmbd/nmbd_workgroupdb.c b/source3/nmbd/nmbd_workgroupdb.c
index 51b2519d837afca4b54c1ba9d9efcddef7d77496..2357fd637b572e6449544fcdd60e4282818747db 100644 (file)
--- a/source3/nmbd/nmbd_workgroupdb.c
+++ b/source3/nmbd/nmbd_workgroupdb.c
@@ -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
@@ -23,17 +22,10 @@
 */
 
 #include "includes.h"
-#include "smb.h"
 
 extern int ClientNMB;
 
-extern int DEBUGLEVEL;
-
-extern pstring global_myname;
-extern fstring global_myworkgroup;
-extern char **my_netbios_names;
 extern uint16 samba_nb_type;
-extern struct in_addr ipzero;
 
 int workgroup_count = 0; /* unique index key: one for each workgroup */
 
@@ -43,33 +35,16 @@ int workgroup_count = 0; /* unique index key: one for each workgroup */
 
 static void add_workgroup(struct subnet_record *subrec, struct work_record *work)
 {
-  struct work_record *w2;
-
-  work->subnet = subrec;
-
-  if (!subrec->workgrouplist)
-  {
-    subrec->workgrouplist = work;
-    work->prev = NULL;
-    work->next = NULL;
-    return;
-  }
-  
-  for (w2 = subrec->workgrouplist; w2->next; w2 = w2->next)
-    ;
-  
-  w2->next = work;
-  work->next = NULL;
-  work->prev = w2;
-
-  subrec->work_changed = True;
+       work->subnet = subrec;
+       DLIST_ADD(subrec->workgrouplist, work);
+       subrec->work_changed = True;
 }
 
 /****************************************************************************
   Create an empty workgroup.
   **************************************************************************/
 
-static struct work_record *create_workgroup(char *name, int ttl)
+static struct work_record *create_workgroup(const char *name, int ttl)
 {
   struct work_record *work;
   struct subnet_record *subrec;
@@ -80,9 +55,9 @@ static struct work_record *create_workgroup(char *name, int ttl)
     DEBUG(0,("create_workgroup: malloc fail !\n"));
     return NULL;
   }
-  bzero((char *)work, sizeof(*work));
+  memset((char *)work, '\0', sizeof(*work));
  
-  StrnCpy(work->work_group,name,sizeof(work->work_group)-1);
+  fstrcpy(work->work_group,name);
   work->serverlist = NULL;
   
   work->RunningElection = False;
@@ -120,7 +95,7 @@ static struct work_record *create_workgroup(char *name, int ttl)
 
   /* No known domain master browser as yet. */
   *work->dmb_name.name = '\0';
-  putip((char *)&work->dmb_addr, &ipzero);
+  zero_ip(&work->dmb_addr);
 
   /* WfWg  uses 01040b01 */
   /* Win95 uses 01041501 */
@@ -158,7 +133,8 @@ static struct work_record *remove_workgroup_from_subnet(struct subnet_record *su
     if (subrec->workgrouplist == work)
       subrec->workgrouplist = work->next; 
   
-    free((char *)work);
+    ZERO_STRUCTP(work);
+    SAFE_FREE(work);
   }
   
   subrec->work_changed = True;
@@ -172,7 +148,7 @@ static struct work_record *remove_workgroup_from_subnet(struct subnet_record *su
   **************************************************************************/
 
 struct work_record *find_workgroup_on_subnet(struct subnet_record *subrec, 
-                                             fstring name)
+                                             const char *name)
 {
   struct work_record *ret;
   
@@ -196,7 +172,7 @@ struct work_record *find_workgroup_on_subnet(struct subnet_record *subrec,
   **************************************************************************/
 
 struct work_record *create_workgroup_on_subnet(struct subnet_record *subrec,
-                                               fstring name, int ttl)
+                                               const char *name, int ttl)
 {
   struct work_record *work = NULL;
 
@@ -235,7 +211,7 @@ static void fail_register(struct subnet_record *subrec, struct response_record *
                           struct nmb_name *nmbname)
 {  
   DEBUG(0,("fail_register: Failed to register name %s on subnet %s.\n",
-            namestr(nmbname), subrec->subnet_name));
+            nmb_namestr(nmbname), subrec->subnet_name));
 }  
 
 /****************************************************************************
@@ -246,7 +222,7 @@ void initiate_myworkgroup_startup(struct subnet_record *subrec, struct work_reco
 {
   int i;
 
-  if(!strequal(global_myworkgroup, work->work_group))
+  if(!strequal(lp_workgroup(), work->work_group))
     return;
 
   /* If this is a broadcast subnet then start elections on it
@@ -264,26 +240,27 @@ workgroup %s on subnet %s\n", work->work_group, subrec->subnet_name));
   
   /* Register the WORKGROUP<0> and WORKGROUP<1e> names on the network. */
 
-  register_name(subrec,global_myworkgroup,0x0,samba_nb_type|NB_GROUP,
+  register_name(subrec,lp_workgroup(),0x0,samba_nb_type|NB_GROUP,
                 NULL,
                 fail_register,NULL);
      
-  register_name(subrec,global_myworkgroup,0x1e,samba_nb_type|NB_GROUP,
+  register_name(subrec,lp_workgroup(),0x1e,samba_nb_type|NB_GROUP,
                 NULL,
                 fail_register,NULL);
      
-  for( i = 0; my_netbios_names[i]; i++)
+  for( i = 0; my_netbios_names(i); i++)
   {
-    char *name = my_netbios_names[i];
+    const char *name = my_netbios_names(i);
     int stype = lp_default_server_announce() | (lp_local_master() ?
                         SV_TYPE_POTENTIAL_BROWSER : 0 );
    
-    if(!strequal(global_myname, name))
+    if(!strequal(global_myname(), name))
         stype &= ~(SV_TYPE_MASTER_BROWSER|SV_TYPE_POTENTIAL_BROWSER|
                    SV_TYPE_DOMAIN_MASTER|SV_TYPE_DOMAIN_MEMBER);
    
     create_server_on_workgroup(work,name,stype|SV_TYPE_LOCAL_LIST_ONLY,
-                PERMANENT_TTL, lp_serverstring());
+                              PERMANENT_TTL, 
+                              string_truncate(lp_serverstring(), MAX_SERVER_STRING_LENGTH));
     DEBUG(3,("initiate_myworkgroup_startup: Added server name entry %s \
 on subnet %s\n", name, subrec->subnet_name));
   }
@@ -303,22 +280,30 @@ void dump_workgroups(BOOL force_write)
     if (subrec->workgrouplist)
     {
       struct work_record *work;
-         
-      DEBUG(debuglevel,("dump_workgroups: dump workgroup on subnet %15s: ", subrec->subnet_name));
-      DEBUG(debuglevel,(" netmask=%15s:\n", inet_ntoa(subrec->mask_ip)));
+
+      if( DEBUGLVL( debuglevel ) )
+      {
+        dbgtext( "dump_workgroups()\n " );
+        dbgtext( "dump workgroup on subnet %15s: ", subrec->subnet_name );
+        dbgtext( "netmask=%15s:\n", inet_ntoa(subrec->mask_ip) );
+      }
          
       for (work = subrec->workgrouplist; work; work = work->next)
       {
-        DEBUG(debuglevel,("\t%s(%d) current master browser = %s\n", work->work_group, 
-                  work->token, 
-                  *work->local_master_browser_name ? work->local_master_browser_name : "UNKNOWN" ));
+        DEBUGADD( debuglevel, ( "\t%s(%d) current master browser = %s\n",
+                                work->work_group,
+                                work->token, 
+                               *work->local_master_browser_name
+                              ? work->local_master_browser_name : "UNKNOWN" ) );
         if (work->serverlist)
         {
           struct server_record *servrec;                 
           for (servrec = work->serverlist; servrec; servrec = servrec->next)
           {
-            DEBUG(debuglevel,("\t\t%s %8x (%s)\n",
-                  servrec->serv.name, servrec->serv.type, servrec->serv.comment));
+            DEBUGADD( debuglevel, ( "\t\t%s %8x (%s)\n",
+                                    servrec->serv.name,
+                                    servrec->serv.type,
+                                    servrec->serv.comment ) );
           }
         }
       }