From 185b94eefa009e852f93d9a00e4e8c15c64a0869 Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Thu, 3 Nov 2011 14:40:46 +0100
Subject: [PATCH] nbt: trim down header dependencies of nbt.idl.

Guenther
---
 librpc/idl/nbt.idl                    | 2 +-
 source3/libsmb/namequery.c            | 1 +
 source4/librpc/idl/winsif.idl         | 1 +
 source4/librpc/idl/winsrepl.idl       | 3 ++-
 source4/smb_server/smb/reply.c        | 1 +
 source4/torture/nbt/winsreplication.c | 1 +
 6 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/librpc/idl/nbt.idl b/librpc/idl/nbt.idl
index cd81081267f..69a1853dafc 100644
--- a/librpc/idl/nbt.idl
+++ b/librpc/idl/nbt.idl
@@ -10,7 +10,7 @@
 
 import "misc.idl", "security.idl";
 [
-	helper("../libcli/netlogon/netlogon.h", "../libcli/nbt/libnbt.h", "../librpc/ndr/ndr_nbt.h"),
+	helper("../librpc/ndr/ndr_nbt.h"),
 	helpstring("NBT messages"),
 	uuid("6def41b6-86e4-4c32-997c-ed33af7bcd8e")
 ]
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index c70e68b1033..df7fdc3d9f4 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -25,6 +25,7 @@
 #include "../libcli/netlogon/netlogon.h"
 #include "lib/async_req/async_sock.h"
 #include "libsmb/nmblib.h"
+#include "../libcli/nbt/libnbt.h"
 
 /* nmbd.c sets this to True. */
 bool global_in_nmbd = False;
diff --git a/source4/librpc/idl/winsif.idl b/source4/librpc/idl/winsif.idl
index a678331b11d..1ca028a2dee 100644
--- a/source4/librpc/idl/winsif.idl
+++ b/source4/librpc/idl/winsif.idl
@@ -6,6 +6,7 @@ import "nbt.idl";
 	uuid("45f52c28-7f9f-101a-b52b-08002b2efabe"),
 	version(1.0),
 	helpstring("WINS Administration Interface1"),
+	helper("../libcli/nbt/libnbt.h"),
 	pointer_default(unique)
 ] interface winsif
 {
diff --git a/source4/librpc/idl/winsrepl.idl b/source4/librpc/idl/winsrepl.idl
index 01b8e32bea5..f60449ec4b2 100644
--- a/source4/librpc/idl/winsrepl.idl
+++ b/source4/librpc/idl/winsrepl.idl
@@ -13,7 +13,8 @@ import "nbt.idl";
 
 [
 	uuid("915f5653-bac1-431c-97ee-9ffb34526921"),
-	helpstring("WINS Replication PDUs")
+	helpstring("WINS Replication PDUs"),
+	helper("../libcli/nbt/libnbt.h")
 ] interface wrepl
 {
 	const int WINS_REPLICATION_PORT = 42;
diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c
index 74f093f37dc..bae6b2ca79e 100644
--- a/source4/smb_server/smb/reply.c
+++ b/source4/smb_server/smb/reply.c
@@ -27,6 +27,7 @@
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "libcli/nbt/libnbt.h"
 
 
 /****************************************************************************
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 56a1c09301c..fef539c4269 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -27,6 +27,7 @@
 #include "system/network.h"
 #include "lib/socket/netif.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "libcli/nbt/libnbt.h"
 #include "torture/torture.h"
 #include "torture/nbt/proto.h"
 #include "param/param.h"
-- 
2.11.4.GIT