r14484: Install more headers

(This used to be commit 430c6516d383bfd7f27287394bf8eef9f174b3e6)

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index a64ceb5da1fbff91140acc97dad35a313809fbb3..4f9ed1a52d4542c5cb6ec3e211e85f41e661c916 100644 (file)
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -69,7 +69,8 @@ OBJ_FILES = pam_errors.o
 #######################
 # Start SUBSYSTEM auth
 [SUBSYSTEM::auth]
-PRIVATE_PROTO_HEADER = auth_proto.h
+PUBLIC_HEADERS = auth.h
+PUBLIC_PROTO_HEADER = auth_proto.h
 OBJ_FILES = \
                auth.o \
                auth_util.o \

diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index 586add9c1491bfa07179910938a0adc981d4a133..dbf20156fa6e1834cbcdb831211ccec33d604d92 100644 (file)
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -1,7 +1,8 @@
 #################################
 # Start SUBSYSTEM gensec
 [SUBSYSTEM::CREDENTIALS]
-PRIVATE_PROTO_HEADER = credentials_proto.h
+PUBLIC_PROTO_HEADER = credentials_proto.h
+PUBLIC_HEADERS = credentials.h
 OBJ_FILES = credentials.o \
                credentials_files.o \
                credentials_krb5.o \

diff --git a/source4/auth/credentials/credentials.h b/source4/auth/credentials/credentials.h
index 58d393f762e3f841f07e91508da49a9b7be77fc9..2e9d77ccae52948144ba16f0d1961fce802f9738 100644 (file)
--- a/source4/auth/credentials/credentials.h
+++ b/source4/auth/credentials/credentials.h
@@ -23,6 +23,8 @@
 #ifndef __CREDENTIALS_H__
 #define __CREDENTIALS_H__
 
+#include "librpc/gen_ndr/misc.h"
+
 struct ccache_container;
 
 /* In order of priority */

diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index a6335692d8aac4ef4ed9eaf40dcc3d7983a866b3..1e5518c545d0bb11ddddb2d84821c44f3202e47f 100644 (file)
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -4,8 +4,8 @@
 VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION = Generic Security Library
-PUBLIC_HEADERS = gensec.h
-PRIVATE_PROTO_HEADER = gensec_proto.h
+PUBLIC_HEADERS = gensec.h spnego.h
+PUBLIC_PROTO_HEADER = gensec_proto.h
 OBJ_FILES = gensec.o
 REQUIRED_SUBSYSTEMS = \
                CREDENTIALS

diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h
index 1e9c74566cdf6401d58914e518be121f2bc84633..f51f8245e31654b5d47263c5051da841b304285e 100644 (file)
--- a/source4/auth/gensec/gensec.h
+++ b/source4/auth/gensec/gensec.h
@@ -128,6 +128,6 @@ struct gensec_critical_sizes {
 };
 
 #include "auth/credentials/credentials.h"
-#include "gensec_proto.h"
+#include "auth/gensec/gensec_proto.h"
 
 #endif /* __GENSEC_H__ */

diff --git a/source4/headermap.txt b/source4/headermap.txt
index 646cc00b8b1563909118eb39c1a9ef8fd87d0fa4..ddf37c5d8ca2b11f2ee8532b95aa1e966fca7dab 100644 (file)
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -39,9 +39,20 @@ libcli/cldap/cldap.h: cldap.h
 lib/samba3/samba3.h: samba3.h
 include/core.h: core.h
 librpc/gen_ndr/dcerpc.h: gen_ndr/dcerpc.h
+librpc/gen_ndr/netlogon.h: gen_ndr/netlogon.h
 librpc/gen_ndr/misc.h: gen_ndr/misc.h
+librpc/gen_ndr/lsa.h: gen_ndr/lsa.h
+librpc/gen_ndr/samr.h: gen_ndr/samr.h
+librpc/gen_ndr/security.h: gen_ndr/security.h
 librpc/ndr/libndr_proto.h: ndr/proto.h
 librpc/rpc/dcerpc_proto.h: dcerpc/proto.h
 lib/tdr/tdr_proto.h: tdr/proto.h
 auth/credentials/credentials.h: credentials.h
 auth/credentials/credentials_proto.h: credentials/proto.h
+rpc_server/dcerpc_server.h: dcerpc_server.h
+rpc_server/dcerpc_server_proto.h: dcerpc_server/proto.h
+auth/auth.h: auth.h
+auth/auth_proto.h: auth/proto.h
+auth/gensec/spnego.h: gensec/spnego.h
+auth/gensec/gensec_proto.h: gensec/proto.h
+libcli/auth/credentials.h: domain_credentials.h

diff --git a/source4/include/core.h b/source4/include/core.h
index 28a14562eff4682c2d7d6f5db03c2843e80e3b7e..cb9da4dd87ede843af13d86693872897507ad278 100644 (file)
--- a/source4/include/core.h
+++ b/source4/include/core.h
@@ -24,6 +24,8 @@
 #ifndef _SAMBA_CORE_H
 #define _SAMBA_CORE_H
 
+#include "libcli/util/nt_status.h"
+
 #define False (0)
 #define True (1)
 #define Auto (2)
@@ -74,4 +76,26 @@ typedef NTSTATUS (*init_module_fn) (void);
 /* same struct as dom_sid but inside a 28 bytes fixed buffer in NDR */
 #define dom_sid28 dom_sid
 
+/* protocol types. It assumes that higher protocols include lower protocols
+   as subsets. FIXME: Move to one of the smb-specific headers */
+enum protocol_types {
+       PROTOCOL_NONE,
+       PROTOCOL_CORE,
+       PROTOCOL_COREPLUS,
+       PROTOCOL_LANMAN1,
+       PROTOCOL_LANMAN2,
+       PROTOCOL_NT1,
+       PROTOCOL_SMB2
+};
+
+/* passed to br lock code. FIXME: Move to one of the smb-specific headers */
+enum brl_type {
+       READ_LOCK,
+       WRITE_LOCK,
+       PENDING_READ_LOCK,
+       PENDING_WRITE_LOCK
+};
+
+
+
 #endif /* _SAMBA_CORE_H */

diff --git a/source4/include/includes.h b/source4/include/includes.h
index f4642cecb90df838bf76b6c72a33518896b123a3..22dc922d1bfe17d6a7cb88e258ed7a1f86bc2649 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -95,31 +95,10 @@ _PUBLIC_ void smb_panic(const char *why) NORETURN_ATTRIBUTE;
 #include <varargs.h>
 #endif
 
-/* protocol types. It assumes that higher protocols include lower protocols
-   as subsets. FIXME: Move to one of the smb-specific headers */
-enum protocol_types {
-       PROTOCOL_NONE,
-       PROTOCOL_CORE,
-       PROTOCOL_COREPLUS,
-       PROTOCOL_LANMAN1,
-       PROTOCOL_LANMAN2,
-       PROTOCOL_NT1,
-       PROTOCOL_SMB2
-};
-
-/* passed to br lock code. FIXME: Move to one of the smb-specific headers */
-enum brl_type {
-       READ_LOCK,
-       WRITE_LOCK,
-       PENDING_READ_LOCK,
-       PENDING_WRITE_LOCK
-};
-
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #include "lib/replace/replace.h"
 
 /* Lists, trees, caching, database... */
-#include "libcli/util/nt_status.h"
 #include "talloc/talloc.h"
 #include "core.h"
 #include "charset/charset.h"

diff --git a/source4/lib/tdr/config.mk b/source4/lib/tdr/config.mk
index 8aa3f85056ec7b0d718891c518ff0d538ad2a2cb..4160ad1ce98a09c0193b3a2f24b17b03afa77f85 100644 (file)
--- a/source4/lib/tdr/config.mk
+++ b/source4/lib/tdr/config.mk
@@ -3,5 +3,5 @@ PUBLIC_HEADERS = tdr.h
 VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION = Simple marshall/unmarshall library
-PRIVATE_PROTO_HEADER = tdr_proto.h
+PUBLIC_PROTO_HEADER = tdr_proto.h
 OBJ_FILES = tdr.o

diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 9740de20208b9ac3dade5f96eef496e0f5e84f60..e4a3784a9176d9ea5cd5b633c329ac4644e919ce 100644 (file)
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -2,7 +2,7 @@
 VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION = Generic utility functions
-PRIVATE_PROTO_HEADER = util_proto.h
+PUBLIC_PROTO_HEADER = util_proto.h
 PUBLIC_HEADERS = util.h \
                                 byteorder.h \
                                 debug.h \

diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk
index 18983e1644e8ce5350cd0c5ff49ee9a8dbc741f5..26e6913c186d90752efedf7ef3f8bc670a0d62e0 100644 (file)
--- a/source4/libcli/auth/config.mk
+++ b/source4/libcli/auth/config.mk
@@ -1,6 +1,7 @@
 #################################
 # Start SUBSYSTEM LIBCLI_AUTH
 [SUBSYSTEM::LIBCLI_AUTH]
+PUBLIC_HEADERS = credentials.h
 PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = credentials.o \
                session.o \

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index ce2abca006e0329b386e2bf060408f9ec64733ea..6680bd484ae87328127940a00e557be6c4ceba96 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -5,7 +5,7 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION = Network Data Representation Core Library
 PUBLIC_HEADERS = ndr/libndr.h
-PRIVATE_PROTO_HEADER = ndr/libndr_proto.h
+PUBLIC_PROTO_HEADER = ndr/libndr_proto.h
 OBJ_FILES = \
                ndr/ndr.o \
                ndr/ndr_basic.o \
@@ -38,6 +38,7 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_security.o
+PUBLIC_HEADERS = gen_ndr/security.h
 REQUIRED_SUBSYSTEMS = NDR_MISC NDR_SECURITY_HELPER
 
 [LIBRARY::NDR_AUDIOSRV]
@@ -101,6 +102,7 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_misc.o
+PUBLIC_HEADERS = gen_ndr/misc.h
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_ROT]
@@ -115,6 +117,7 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_lsa.o
+PUBLIC_HEADERS = gen_ndr/lsa.h
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DFS]
@@ -168,6 +171,7 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_samr.o
+PUBLIC_HEADERS = gen_ndr/samr.h
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_LSA NDR_SECURITY
 
 [LIBRARY::NDR_SPOOLSS]
@@ -351,6 +355,7 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_netlogon.o
+PUBLIC_HEADERS = gen_ndr/netlogon.h
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SAMR NDR_LSA
 
 [LIBRARY::NDR_TRKWKS]
@@ -700,6 +705,7 @@ REQUIRED_SUBSYSTEMS = dcerpc NDR_KEYSVC
 [SUBSYSTEM::NDR_DCERPC]
 OBJ_FILES = gen_ndr/ndr_dcerpc.o
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC
+PUBLIC_HEADERS = gen_ndr/dcerpc.h
 
 ################################################
 # Start SUBSYSTEM dcerpc
@@ -708,7 +714,7 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION = DCE/RPC client library
 PUBLIC_HEADERS = rpc/dcerpc.h
-PRIVATE_PROTO_HEADER = rpc/dcerpc_proto.h
+PUBLIC_PROTO_HEADER = rpc/dcerpc_proto.h
 OBJ_FILES = \
                rpc/dcerpc.o \
                rpc/dcerpc_auth.o \

diff --git a/source4/librpc/idl/dcerpc.idl b/source4/librpc/idl/dcerpc.idl
index 5816259ae73ef95fe158e970c96d7ccf5f88c0f3..e0366adf07b63a596ee0ad952930c96a9870d01a 100644 (file)
--- a/source4/librpc/idl/dcerpc.idl
+++ b/source4/librpc/idl/dcerpc.idl
@@ -9,7 +9,8 @@
   layouts
 */
 [
-pointer_default(unique)
+pointer_default(unique),
+depends(misc)
 ]
 interface dcerpc
 {

diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index d6f46fa44e9d873e14ad8ca04b6863233e9d55d8..d3ff7c5e42fe325aded659b61210eec708090bfe 100644 (file)
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -21,6 +21,9 @@
 #ifndef __LIBNDR_H__
 #define __LIBNDR_H__
 
+#include "core.h"
+#include "lib/talloc/talloc.h"
+
 /*
   this provides definitions for the libcli/rpc/ MSRPC library
 */

diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index 8a5328d2943c4ead6cc24a6e739aeb41ab332836..7ded61909553ada5741603e3924478509bd0ae4c 100644 (file)
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -203,7 +203,8 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 # Start SUBSYSTEM dcerpc_server
 [SUBSYSTEM::dcerpc_server]
-PRIVATE_PROTO_HEADER = dcerpc_server_proto.h
+PUBLIC_HEADERS = dcerpc_server.h
+PUBLIC_PROTO_HEADER = dcerpc_server_proto.h
 OBJ_FILES = \
                dcerpc_server.o \
                dcerpc_sock.o \

diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h
index 98cee05f883ebef59e9b526a49267e97065bba30..13e9b897fd8f00a154eb82970eff554ec8e96b00 100644 (file)
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -24,6 +24,11 @@
 #ifndef SAMBA_DCERPC_SERVER_H
 #define SAMBA_DCERPC_SERVER_H
 
+#include "core.h"
+#include "librpc/gen_ndr/misc.h"
+#include "librpc/gen_ndr/dcerpc.h"
+#include "librpc/ndr/libndr.h"
+
 /* modules can use the following to determine if the interface has changed
  * please increment the version number after each interface change
  * with a comment and maybe update struct dcesrv_critical_sizes.