r13926: More header splitups.

(This used to be commit 930daa9f416ecba1d75b8ad46bb42e336545672f)

diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk
index ebd527c74bf857951e9953b1c13b0f06948c307f..dbab3225115a307402d7c98b37f26c77f6bee2e0 100644 (file)
--- a/source4/auth/kerberos/config.mk
+++ b/source4/auth/kerberos/config.mk
@@ -1,6 +1,7 @@
 #################################
 # Start SUBSYSTEM KERBEROS
 [SUBSYSTEM::KERBEROS]
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = kerberos.o \
                        clikrb5.o \
                        kerberos_verify.o \

diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
index f070c25e0e8c287c1b22d96949f8003132310f48..2408291a48377d291ddb599856f9c74168a02306 100644 (file)
--- a/source4/auth/kerberos/kerberos.h
+++ b/source4/auth/kerberos/kerberos.h
@@ -163,5 +163,7 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx,
                                          gss_cred_id_t gssapi_cred,
                                          enum credentials_obtained obtained); 
 
+#include "auth/kerberos/proto.h"
+
 #endif /* HAVE_KRB5 */
 

diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index f522995bc4910c0f7833242d2869ee6f7223dac9..ef2487cc9d57608226e2f34caf0a66e868ece7e6 100644 (file)
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -25,6 +25,7 @@
 #include "lib/socket/socket.h"
 #include "lib/messaging/irpc.h"
 #include "smbd/service_task.h"
+#include "smbd/service.h"
 #include "cldap_server/cldap_server.h"
 #include "system/network.h"
 #include "netif/netif.h"

diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 77ed9b6f15c8ccfe8ce3cbb4cf15d8f2bd75e93f..97f82460024880c981baea572d345efef37f936d 100644 (file)
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "smbd/service_task.h"
+#include "smbd/service.h"
 #include "smbd/service_stream.h"
 #include "smbd/process_model.h"
 #include "lib/events/events.h"

diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index b1ef4ff006357a979fc9a57eda5c103b88d1f386..40a1dc0b9b06e4ea51be552776e76773c2f8f493 100644 (file)
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -30,6 +30,7 @@
 #include "ldap_server/ldap_server.h"
 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"
+#include "smbd/proto.h"
 #include "lib/socket/socket.h"
 #include "lib/tls/tls.h"
 #include "lib/messaging/irpc.h"

diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index adfb6cedb798138041ffc1b30d597712148f5b8e..423fef567f2f066c61b80e7dcf00c20644e6bcb3 100644 (file)
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -172,6 +172,7 @@ OBJ_FILES = \
 ################################################
 # Start SUBSYSTEM LIBLDB_CMDLINE
 [SUBSYSTEM::LIBLDB_CMDLINE]
+NOPROTO = NO
 OBJ_FILES= \
                tools/cmdline.o
 REQUIRED_SUBSYSTEMS = LIBLDB LIBBASIC LIBPOPT POPT_SAMBA POPT_CREDENTIALS

diff --git a/source4/lib/registry/reg_backend_rpc.c b/source4/lib/registry/reg_backend_rpc.c
index 0fda6c64ccff7ab68555b186f8023cadd0ec31cb..ced5f92e5e65d35c8d43bb5d430d8b7a5eb736c7 100644 (file)
--- a/source4/lib/registry/reg_backend_rpc.c
+++ b/source4/lib/registry/reg_backend_rpc.c
@@ -356,7 +356,7 @@ static struct hive_operations reg_backend_rpc = {
        .num_values = rpc_num_values,
 };
 
-WERROR _PUBLIC_ reg_open_remote(struct registry_context **ctx, struct cli_credentials *credentials, 
+_PUBLIC_ WERROR reg_open_remote(struct registry_context **ctx, struct cli_credentials *credentials, 
                       const char *location, struct event_context *ev)
 {
        NTSTATUS status;

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 71adaaa8c9259e77c1048de44af9e85c3e6310e7..b24c44977a82d9fdd05688651ddd7bcad51b8906 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -3,7 +3,7 @@ include ldap/config.mk
 include security/config.mk
 
 [SUBSYSTEM::LIBCLI_UTILS]
-PUBLIC_HEADERS = util/nterr.h util/doserr.h
+PUBLIC_HEADERS = util/nterr.h util/doserr.h util/nt_status.h
 OBJ_FILES = util/asn1.o \
                util/doserr.o \
                util/errormap.o \

diff --git a/source4/main.mk b/source4/main.mk
index 141278ad6b3e19e065e0a8d374e05bb5138fc3ec..ecc614ca7bf1ce52f24cd8eb016cddf35d6296c3 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -31,8 +31,7 @@ include scripting/config.mk
 include kdc/config.mk
 include passdb/config.mk
 
-DEFAULT_HEADERS = $(srcdir)/include/nt_status.h \
-                                 $(srcdir)/include/smb.h $(srcdir)/include/core.h
+DEFAULT_HEADERS = $(srcdir)/include/smb.h $(srcdir)/include/core.h
 
 binaries: $(BINARIES)
 libraries: $(STATIC_LIBS) $(SHARED_LIBS)

diff --git a/source4/nbt_server/irpc.c b/source4/nbt_server/irpc.c
index 40ea2e5ef378fabafd1aa118f8bbffb9727b702a..8943570f3f8befaa7ed87a67e5d80fa529426b99 100644 (file)
--- a/source4/nbt_server/irpc.c
+++ b/source4/nbt_server/irpc.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "smbd/service_task.h"
+#include "smbd/proto.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
 #include "lib/socket/socket.h"

diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c
index 0d4940d459d42598a138c6dc7b0e0c3b59e6c0b1..a11783c238ab46ca171260ee12b0f9019f231446 100644 (file)
--- a/source4/nbt_server/nbt_server.c
+++ b/source4/nbt_server/nbt_server.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "smbd/service_task.h"
+#include "smbd/proto.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
 #include "system/network.h"

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 3e92ce0ef35f8626a047a5744e4f46682a46667f..3b38353ba4c2690c1cfc533f4ef0526de3023aea 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -28,6 +28,7 @@
 #include "rpc_server/dcerpc_server.h"
 #include "lib/events/events.h"
 #include "smbd/service_stream.h"
+#include "smbd/proto.h"
 #include "system/filesys.h"
 #include "libcli/security/proto.h"
 #include "build.h"

diff --git a/source4/rpc_server/dcerpc_sock.c b/source4/rpc_server/dcerpc_sock.c
index d696b75b208a3c40832dc02acda852a122685cfe..bf701cb8477ff8831be3f7b56def321cac755b48 100644 (file)
--- a/source4/rpc_server/dcerpc_sock.c
+++ b/source4/rpc_server/dcerpc_sock.c
@@ -27,6 +27,7 @@
 #include "lib/events/events.h"
 #include "rpc_server/dcerpc_server.h"
 #include "smbd/service_stream.h"
+#include "smbd/proto.h"
 #include "lib/messaging/irpc.h"
 #include "system/network.h"
 #include "netif/netif.h"

diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index 469f9372192813793474369d269c4e82af86d5a1..dc2eb52a1787e86027ebfa76364fd47d0e5674e1 100644 (file)
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "smbd/service_stream.h"
+#include "smbd/proto.h"
 #include "smb_server/smb_server.h"
 #include "lib/messaging/irpc.h"
 #include "lib/stream/packet.h"

diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index b6a7cfd039b3333da3cdf3480b87d471656bec79..5e862f2b6bb3f13332f4634ecb014391a4bf47fb 100644 (file)
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -105,6 +105,7 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 # Start SUBSYSTEM SERVICE
 [SUBSYSTEM::SERVER_SERVICE]
+PRIVATE_PROTO_HEADER = service.h
 OBJ_FILES = \
                service.o \
                service_stream.o \

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 9c45da302dc2375b2231960fb674a2d00584cc3a..b9e0858b500c9da4ccf4c6cf0bbec695ad9c351b 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -35,6 +35,7 @@
 #include "ntptr/ntptr.h"
 #include "auth/gensec/gensec.h"
 #include "smbd/process_model.h"
+#include "smbd/proto.h"
 
 /*
   recursively delete a directory tree

diff --git a/source4/web_server/http.c b/source4/web_server/http.c
index c90780a249c83ebc65416e514fb18d9032d54ec2..749e881554d38db10af35d399590f8858b25c83f 100644 (file)
--- a/source4/web_server/http.c
+++ b/source4/web_server/http.c
@@ -24,6 +24,7 @@
 #include "smbd/service_task.h"
 #include "web_server/web_server.h"
 #include "smbd/service_stream.h"
+#include "smbd/proto.h"
 #include "lib/events/events.h"
 #include "system/time.h"
 #include "lib/appweb/esp/esp.h"

diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index e1d418a68285a4180a3e5a6204a86a2b6f112c85..bf981ceccfcb680e913bc9e3b1ec8dc2b4a1ff06 100644 (file)
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"
+#include "smbd/proto.h"
 #include "web_server/web_server.h"
 #include "lib/events/events.h"
 #include "system/filesys.h"

diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index 45684be0f4120118fb3e32d05d4202a793ab4416..f6083a6fc8466fb4ad498f595fe89ae0e90e567f 100644 (file)
--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@@ -30,6 +30,7 @@
 #include "nsswitch/winbind_nss_config.h"
 #include "winbind/wb_server.h"
 #include "lib/stream/packet.h"
+#include "smbd/service.h"
 
 void wbsrv_terminate_connection(struct wbsrv_connection *wbconn, const char *reason)
 {

diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index 6e6d2db3208e36ff1bd31758211b4b7c082c30d8..dabb5500480abd151204607a2ee14a280b5b2bc0 100644 (file)
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -25,6 +25,7 @@
 #include "lib/stream/packet.h"
 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"
+#include "smbd/service.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "wrepl_server/wrepl_server.h"

diff --git a/source4/wrepl_server/wrepl_periodic.c b/source4/wrepl_server/wrepl_periodic.c
index c598bb8e8a8f525c500135770460a22d6de60a74..c342656eef2bd76ca41d54552bcd3535bef7069f 100644 (file)
--- a/source4/wrepl_server/wrepl_periodic.c
+++ b/source4/wrepl_server/wrepl_periodic.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "smbd/service_task.h"
+#include "smbd/service.h"
 #include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 

diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index 29d3246d6273d1fe0485266eae60482a1fe75a9e..49eb13909a012dba8c4aac1330295c8bf3bcd9d2 100644 (file)
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "dlinklist.h"
 #include "smbd/service_task.h"
+#include "smbd/service.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "wrepl_server/wrepl_server.h"