s3-nmbd: move nmbd proto out of main proto.h

[metze/samba/wip.git] / source3 / nmbd / nmbd_workgroupdb.c

diff --git a/source3/nmbd/nmbd_workgroupdb.c b/source3/nmbd/nmbd_workgroupdb.c
index 82c3a31669d52e36783dcb769ac8749d30171ba4..5ce10e64d46e8434b439252f30f2aa80aeb72f76 100644 (file)
--- a/source3/nmbd/nmbd_workgroupdb.c
+++ b/source3/nmbd/nmbd_workgroupdb.c
@@ -21,6 +21,8 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
+#include "nmbd/nmbd.h"
 
 extern uint16 samba_nb_type;
 
@@ -139,14 +141,7 @@ static struct work_record *remove_workgroup_from_subnet(struct subnet_record *su
        remove_all_servers(work);
   
        if (!work->serverlist) {
-               if (work->prev)
-                       work->prev->next = work->next;
-               if (work->next)
-                       work->next->prev = work->prev;
-  
-               if (subrec->workgrouplist == work)
-                       subrec->workgrouplist = work->next; 
-  
+               DLIST_REMOVE(subrec->workgrouplist, work);
                ZERO_STRUCTP(work);
                SAFE_FREE(work);
        }
@@ -269,7 +264,7 @@ on subnet %s\n", name, subrec->subnet_name));
   Dump a copy of the workgroup database into the log file.
   **************************************************************************/
 
-void dump_workgroups(BOOL force_write)
+void dump_workgroups(bool force_write)
 {
        struct subnet_record *subrec;
        int debuglevel = force_write ? 0 : 4;