r13926: More header splitups.

source/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 \

source/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 */
 

source/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"

source/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"

source/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"

source/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

source/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;

source/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 \

source/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)

source/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"

source/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"

source/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"

source/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"

source/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"

source/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 \

source/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

source/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"

source/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"

source/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)
 {

source/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"

source/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"
 

source/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"