From 35349a58df5b69446607fbd742a05f57f3515319 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 18 Mar 2006 15:42:57 +0000
Subject: r14542: Remove librpc, libndr and libnbt from includes.h (This used
 to be commit 51b4270513752d2eafbe77f9de598de16ef84a1f)

---
 source4/libcli/composite/composite.c          |  2 ++
 source4/libcli/composite/composite.h          |  2 ++
 source4/libcli/config.mk                      |  2 +-
 source4/libcli/ldap/ldap.h                    |  4 ++++
 source4/libcli/raw/libcliraw.h                |  2 ++
 source4/libcli/resolve/nbtlist.c              |  1 +
 source4/libcli/resolve/resolve.h              | 29 +++++++++++++++++++++++++++
 source4/libcli/resolve/wins.c                 |  1 +
 source4/libcli/security/access_check.c        |  1 +
 source4/libcli/security/dom_sid.c             |  1 +
 source4/libcli/security/privilege.c           |  1 +
 source4/libcli/security/sddl.c                |  2 +-
 source4/libcli/security/security_descriptor.c |  1 +
 source4/libcli/smb2/smb2_calls.h              |  2 ++
 14 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 source4/libcli/resolve/resolve.h

(limited to 'source4/libcli')

diff --git a/source4/libcli/composite/composite.c b/source4/libcli/composite/composite.c
index c8d6cd136a3..9a745e3013e 100644
--- a/source4/libcli/composite/composite.c
+++ b/source4/libcli/composite/composite.c
@@ -26,6 +26,8 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "lib/messaging/irpc.h"
+#include "librpc/rpc/dcerpc.h"
+#include "libcli/nbt/libnbt.h"
 
 /*
   block until a composite function has completed, then return the status
diff --git a/source4/libcli/composite/composite.h b/source4/libcli/composite/composite.h
index 6210b2b2271..dc04f5a8833 100644
--- a/source4/libcli/composite/composite.h
+++ b/source4/libcli/composite/composite.h
@@ -63,5 +63,7 @@ struct composite_context {
 
 struct irpc_request;
 struct smbcli_request;
+struct rpc_request;
+struct nbt_name_request;
 
 #include "libcli/composite/proto.h"
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 465146ec17f..dbeae51807a 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -80,7 +80,7 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = NDR_WINSREPL SOCKET LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_RESOLVE]
-PRIVATE_PROTO_HEADER = resolve/resolve.h
+PRIVATE_PROTO_HEADER = resolve/proto.h
 OBJ_FILES = \
 	resolve/resolve.o \
 	resolve/nbtlist.o \
diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/ldap.h
index 1deabf0b102..ba0f8018326 100644
--- a/source4/libcli/ldap/ldap.h
+++ b/source4/libcli/ldap/ldap.h
@@ -247,6 +247,10 @@ struct ldap_message {
 	struct ldb_control    **controls;
 };
 
+struct event_context;
+struct cli_credentials;
+struct dom_sid;
+
 #include "libcli/ldap/ldap_proto.h"
 
 #endif
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index 21d0b0dcdb4..2b856aa52b2 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -31,6 +31,8 @@ struct smbcli_request;  /* forward declare */
 struct smbcli_session;  /* forward declare */
 struct smbcli_transport;  /* forward declare */
 
+struct cli_credentials;
+
 /* default timeout for all smb requests */
 #define SMB_REQUEST_TIMEOUT 60
 
diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c
index 7188faba7b0..a8ca2ced8b8 100644
--- a/source4/libcli/resolve/nbtlist.c
+++ b/source4/libcli/resolve/nbtlist.c
@@ -29,6 +29,7 @@
 #include "system/network.h"
 #include "netif/netif.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "libcli/nbt/libnbt.h"
 
 struct nbtlist_state {
 	struct nbt_name name;
diff --git a/source4/libcli/resolve/resolve.h b/source4/libcli/resolve/resolve.h
new file mode 100644
index 00000000000..ad479bab4b3
--- /dev/null
+++ b/source4/libcli/resolve/resolve.h
@@ -0,0 +1,29 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   general name resolution interface
+
+   Copyright (C) Andrew Tridgell 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.
+*/
+
+#ifndef __RESOLVE_H__
+#define __RESOLVE_H__
+
+#include "libcli/nbt/libnbt.h"
+#include "libcli/resolve/proto.h"
+
+#endif /* __RESOLVE_H__ */
diff --git a/source4/libcli/resolve/wins.c b/source4/libcli/resolve/wins.c
index f11033ae4f5..64787106824 100644
--- a/source4/libcli/resolve/wins.c
+++ b/source4/libcli/resolve/wins.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/nbt/libnbt.h"
 #include "libcli/resolve/resolve.h"
 
 /*
diff --git a/source4/libcli/security/access_check.c b/source4/libcli/security/access_check.c
index 9d565363e6c..1617963998c 100644
--- a/source4/libcli/security/access_check.c
+++ b/source4/libcli/security/access_check.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/security.h"
 #include "libcli/security/proto.h"
 
 
diff --git a/source4/libcli/security/dom_sid.c b/source4/libcli/security/dom_sid.c
index b5ced9fcc26..131d1afa9c5 100644
--- a/source4/libcli/security/dom_sid.c
+++ b/source4/libcli/security/dom_sid.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/security.h"
 
 /*****************************************************************
  Compare the auth portion of two sids.
diff --git a/source4/libcli/security/privilege.c b/source4/libcli/security/privilege.c
index fec8c1278c0..202a418f6ba 100644
--- a/source4/libcli/security/privilege.c
+++ b/source4/libcli/security/privilege.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/security.h" 
 
 
 static const struct {
diff --git a/source4/libcli/security/sddl.c b/source4/libcli/security/sddl.c
index 862a25e20d1..38192fc60ce 100644
--- a/source4/libcli/security/sddl.c
+++ b/source4/libcli/security/sddl.c
@@ -22,8 +22,8 @@
 
 #include "includes.h"
 #include "system/iconv.h"
-#include "libcli/security/proto.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/proto.h"
 
 struct flag_map {
 	const char *name;
diff --git a/source4/libcli/security/security_descriptor.c b/source4/libcli/security/security_descriptor.c
index 20cdeb0ba7c..1da3e2e7508 100644
--- a/source4/libcli/security/security_descriptor.c
+++ b/source4/libcli/security/security_descriptor.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/security.h"
 #include "libcli/security/proto.h"
 
 /*
diff --git a/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h
index af1730aeeeb..b6f8fdef71e 100644
--- a/source4/libcli/smb2/smb2_calls.h
+++ b/source4/libcli/smb2/smb2_calls.h
@@ -363,4 +363,6 @@ struct smb2_flush {
 	} in;
 };
 
+struct cli_credentials;
+struct event_context;
 #include "libcli/smb2/smb2_proto.h"
-- 
cgit