r12644: prepare the dns proxy feature for the wins server

metze
(This used to be commit 48842cd9abcff744851ad1481309fb901be3a73b)

diff --git a/source4/nbt_server/config.mk b/source4/nbt_server/config.mk
index 60c338d0fc61fe75d1cad9efd6ac9040bebb61d0..bc415516ad910598e8801e663b927bca2d215144 100644 (file)
--- a/source4/nbt_server/config.mk
+++ b/source4/nbt_server/config.mk
@@ -17,7 +17,8 @@ REQUIRED_SUBSYSTEMS = \
 OBJ_FILES = \
                wins/winsserver.o \
                wins/winsclient.o \
-               wins/winswack.o
+               wins/winswack.o \
+               wins/wins_dns_proxy.o
 PRIVATE_PROTO_HEADER = wins/winsserver_proto.h
 REQUIRED_SUBSYSTEMS = \
                LIBCLI_NBT WINSDB

diff --git a/source4/nbt_server/wins/wins_dns_proxy.c b/source4/nbt_server/wins/wins_dns_proxy.c
new file mode 100644 (file)
index 0000000..8fb6396
--- /dev/null
+++ b/source4/nbt_server/wins/wins_dns_proxy.c
@@ -0,0 +1,40 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   wins server dns proxy
+
+   Copyright (C) Stefan Metzmacher     2005
+      
+   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
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.
+*/
+
+#include "includes.h"
+#include "nbt_server/nbt_server.h"
+#include "nbt_server/wins/winsdb.h"
+#include "nbt_server/wins/winsserver.h"
+#include "system/time.h"
+#include "libcli/composite/composite.h"
+#include "smbd/service_task.h"
+
+/*
+  dns proxy query a name
+*/
+void nbtd_wins_dns_proxy_query(struct nbt_name_socket *nbtsock, 
+                              struct nbt_name_packet *packet, 
+                              const struct nbt_peer_socket *src)
+{
+       /* TODO: add a real implementation here */
+       nbtd_negative_name_query_reply(nbtsock, packet, src);
+}

diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index 3eddfb763982b99a1d85d86c6dbd9a8903bc209f..449a11f4fc96dc873181e129ebf5a506b5325193 100644 (file)
--- a/source4/nbt_server/wins/winsserver.c
+++ b/source4/nbt_server/wins/winsserver.c
@@ -583,7 +583,16 @@ static void nbtd_winsserver_query(struct nbt_name_socket *nbtsock,
 
        status = winsdb_lookup(winssrv->wins_db, name, packet, &rec);
        if (!NT_STATUS_IS_OK(status)) {
-               goto notfound;
+               if (!lp_wins_dns_proxy()) {
+                       goto notfound;
+               }
+
+               if (name->type != NBT_NAME_CLIENT && name->type != NBT_NAME_SERVER) {
+                       goto notfound;
+               }
+
+               nbtd_wins_dns_proxy_query(nbtsock, packet, src);
+               return;
        }
 
        /*

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index a87e5897e3453069643af808332c7aace808466d..e6b4b9550051081745dd11f19084b74859afb278 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -164,6 +164,7 @@ typedef struct
        int web_port;
        char *socket_options;
        BOOL bWINSsupport;
+       BOOL bWINSdnsProxy;
        BOOL bLocalMaster;
        BOOL bPreferredMaster;
        BOOL bEncryptPasswords;
@@ -519,6 +520,7 @@ static struct parm_struct parm_table[] = {
        
        {"wins server", P_LIST, P_GLOBAL, &Globals.szWINSservers, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
        {"wins support", P_BOOL, P_GLOBAL, &Globals.bWINSsupport, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
+       {"dns proxy", P_BOOL, P_GLOBAL, &Globals.bWINSdnsProxy, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
 
        {"Locking Options", P_SEP, P_SEPARATOR},
        
@@ -672,7 +674,8 @@ static void init_globals(void)
        do_parameter("PreferredMaster", "Auto", NULL);
        do_parameter("LocalMaster", "True", NULL);
 
-       do_parameter("WINSsupport", "False", NULL);
+       do_parameter("wins support", "False", NULL);
+       do_parameter("dns proxy", "False", NULL);
 
        do_parameter("winbind separator", "\\", NULL);
        do_parameter("winbind sealed pipes", "True", NULL);
@@ -847,6 +850,7 @@ FN_GLOBAL_STRING(lp_panic_action, &Globals.szPanicAction)
 
 FN_GLOBAL_BOOL(lp_disable_netbios, &Globals.bDisableNetbios)
 FN_GLOBAL_BOOL(lp_wins_support, &Globals.bWINSsupport)
+FN_GLOBAL_BOOL(lp_wins_dns_proxy, &Globals.bWINSdnsProxy)
 FN_GLOBAL_BOOL(lp_local_master, &Globals.bLocalMaster)
 FN_GLOBAL_BOOL(lp_readraw, &Globals.bReadRaw)
 FN_GLOBAL_BOOL(lp_large_readwrite, &Globals.bLargeReadwrite)