r12607: fix the build

metze

diff --git a/source/nbt_server/config.mk b/source/nbt_server/config.mk
index ac342840ace8ed7c8722a396efa7d543c129e04d..a8aab7b2ad2a4e20d293d19cfde02adec001c375 100644 (file)
--- a/source/nbt_server/config.mk
+++ b/source/nbt_server/config.mk
@@ -17,7 +17,7 @@ OBJ_FILES = \
                wins/winsserver.o \
                wins/winsclient.o \
                wins/winswack.o
-PRIVATE_PROTO_HEADER = wins/winswack_proto.h
+PRIVATE_PROTO_HEADER = wins/winsserver_proto.h
 REQUIRED_SUBSYSTEMS = \
                LIBCLI_NBT WINSDB
 # End SUBSYSTEM NBTD_WINS

diff --git a/source/nbt_server/defense.c b/source/nbt_server/defense.c
index 0819fd4f2f7c2fa65b3bf6c2bb73ed4202eb7137..7811c254c05b59aa0bdcdfe5623d815461dd5948 100644 (file)
--- a/source/nbt_server/defense.c
+++ b/source/nbt_server/defense.c
@@ -24,6 +24,7 @@
 #include "dlinklist.h"
 #include "system/network.h"
 #include "nbt_server/nbt_server.h"
+#include "nbt_server/wins/winsserver.h"
 
 
 /*

diff --git a/source/nbt_server/interfaces.c b/source/nbt_server/interfaces.c
index 344d1b57d3f1866bac0d04ae2fdc44006493b6ed..41a27fdeb0cd82d82f00d8042ce38028f156d8b7 100644 (file)
--- a/source/nbt_server/interfaces.c
+++ b/source/nbt_server/interfaces.c
@@ -25,6 +25,7 @@
 #include "nbt_server/nbt_server.h"
 #include "smbd/service_task.h"
 #include "lib/socket/socket.h"
+#include "nbt_server/wins/winsserver.h"
 
 
 /*

diff --git a/source/nbt_server/irpc.c b/source/nbt_server/irpc.c
index 2e72b8146c40002b8ef89272ec43efe2c5177ac3..b3b168a8c0d86a1a4fa86cf1b94b7ef69593773c 100644 (file)
--- a/source/nbt_server/irpc.c
+++ b/source/nbt_server/irpc.c
@@ -24,7 +24,7 @@
 #include "includes.h"
 #include "smbd/service_task.h"
 #include "nbt_server/nbt_server.h"
-
+#include "nbt_server/wins/winsserver.h"
 
 /*
   serve out the nbt statistics

diff --git a/source/nbt_server/nbt_server.c b/source/nbt_server/nbt_server.c
index 3ba06c7df9d7c87425ff502b568fbd5ac8df7891..5e8d8fb073c003c5a1775d3aeba1a20dd9c560bb 100644 (file)
--- a/source/nbt_server/nbt_server.c
+++ b/source/nbt_server/nbt_server.c
@@ -24,7 +24,7 @@
 #include "lib/events/events.h"
 #include "smbd/service_task.h"
 #include "nbt_server/nbt_server.h"
-
+#include "nbt_server/wins/winsserver.h"
 
 /*
   startup the nbtd task

diff --git a/source/nbt_server/query.c b/source/nbt_server/query.c
index f71d7b99ed14c2e6dcab9ece9457025868b7d331..39300f6e014df648d1f7b3c94693a290a5311a22 100644 (file)
--- a/source/nbt_server/query.c
+++ b/source/nbt_server/query.c
@@ -24,7 +24,7 @@
 #include "dlinklist.h"
 #include "system/network.h"
 #include "nbt_server/nbt_server.h"
-
+#include "nbt_server/wins/winsserver.h"
 
 /*
   answer a name query
@@ -54,25 +54,30 @@ void nbtd_request_query(struct nbt_name_socket *nbtsock,
        /* see if we have the requested name on this interface */
        name = &packet->questions[0].name;
 
-       if (!(packet->operation & NBT_FLAG_BROADCAST) &&
-          (packet->operation & NBT_FLAG_RECURSION_DESIRED)) {
-               nbtd_winsserver_request(nbtsock, packet, src);
-               return;
-       }
-
        iname = nbtd_find_iname(iface, name, 0);
-
        if (iname == NULL) {
                /* don't send negative replies to broadcast queries */
                if (packet->operation & NBT_FLAG_BROADCAST) {
                        return;
                }
 
+               if (packet->operation & NBT_FLAG_RECURSION_DESIRED) {
+                       nbtd_winsserver_request(nbtsock, packet, src);
+                       return;
+               }
+
                /* otherwise send a negative reply */
                nbtd_negative_name_query_reply(nbtsock, packet, src);
                return;
        }
 
+       if (!(packet->operation & NBT_FLAG_BROADCAST) &&
+          (packet->operation & NBT_FLAG_RECURSION_DESIRED) &&
+          (iname->nb_flags & NBT_NM_GROUP)) {
+               nbtd_winsserver_request(nbtsock, packet, src);
+               return;
+       }
+
        /* if the name is not yet active and its a broadcast query then
           ignore it for now */
        if (!(iname->nb_flags & NBT_NM_ACTIVE) && 

diff --git a/source/nbt_server/register.c b/source/nbt_server/register.c
index 74f664ba407f24fcdf4512581ec3dc7e02aad15b..a18e3f441299efe7d5759594958bdb874a97b909 100644 (file)
--- a/source/nbt_server/register.c
+++ b/source/nbt_server/register.c
@@ -27,6 +27,7 @@
 #include "smbd/service_task.h"
 #include "libcli/composite/composite.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "nbt_server/wins/winsserver.h"
 
 
 static void nbtd_start_refresh_timer(struct nbtd_iface_name *iname);

diff --git a/source/nbt_server/wins/winsclient.c b/source/nbt_server/wins/winsclient.c
index 6bf328d1466edebb9f09e40c4a57a262a6c134cd..2538105fb89c99928ab820cd2df0812bfa300219 100644 (file)
--- a/source/nbt_server/wins/winsclient.c
+++ b/source/nbt_server/wins/winsclient.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
+#include "nbt_server/wins/winsserver.h"
 #include "libcli/composite/composite.h"
 #include "lib/events/events.h"
 #include "smbd/service_task.h"

diff --git a/source/nbt_server/wins/winsserver.c b/source/nbt_server/wins/winsserver.c
index a456ed06d5828fd5f4ea9b850a22e2891007aff3..c01ab9a19ba45d3384ce02ddb938f227ef96e668 100644 (file)
--- a/source/nbt_server/wins/winsserver.c
+++ b/source/nbt_server/wins/winsserver.c
@@ -24,7 +24,7 @@
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsdb.h"
-#include "nbt_server/wins/winswack.h"
+#include "nbt_server/wins/winsserver.h"
 #include "system/time.h"
 #include "libcli/composite/composite.h"
 #include "smbd/service_task.h"

diff --git a/source/nbt_server/wins/winswack.h b/source/nbt_server/wins/winsserver.h
similarity index 95%
rename from source/nbt_server/wins/winswack.h
rename to source/nbt_server/wins/winsserver.h
index 42105f08fff07ce1f92813db6504e5e1c2211a20..0ac40e750178b8d5f9eb24221cf4f6b417dab30d 100644 (file)
--- a/source/nbt_server/wins/winswack.h
+++ b/source/nbt_server/wins/winsserver.h
@@ -34,4 +34,4 @@ struct wins_challenge_io {
        } out;
 };
 
-#include "nbt_server/wins/winswack_proto.h"
+#include "nbt_server/wins/winsserver_proto.h"

diff --git a/source/nbt_server/wins/winswack.c b/source/nbt_server/wins/winswack.c
index 9e41d14e45c76eb486a2f3ead27f4e8c20de42e4..2da73fa9cf98dca5f79227d5e321da778abe7f30 100644 (file)
--- a/source/nbt_server/wins/winswack.c
+++ b/source/nbt_server/wins/winswack.c
@@ -24,7 +24,7 @@
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsdb.h"
-#include "nbt_server/wins/winswack.h"
+#include "nbt_server/wins/winsserver.h"
 #include "system/time.h"
 #include "libcli/composite/composite.h"