r13938: Around round of splitups

(This used to be commit 2d655f0528)

source4/auth/auth_unix.c

@@ -24,6 +24,7 @@
 #include "auth/auth.h"
 #include "system/passwd.h" /* needed by some systems for struct passwd */
 #include "lib/socket/socket.h" 
+#include "auth/pam_errors.h"
 
 /* TODO: look at how to best fill in parms retrieveing a struct passwd info
  * except in case USER_INFO_DONT_CHECK_UNIX_ACCOUNT is set

source4/auth/config.mk

@@ -63,6 +63,7 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 
 [SUBSYSTEM::PAM_ERRORS]
+PRIVATE_PROTO_HEADER = pam_errors.h
 OBJ_FILES = pam_errors.o
 
 #######################

source4/auth/gensec/config.mk

@@ -59,6 +59,7 @@ REQUIRED_SUBSYSTEMS = AUTH SCHANNELDB NDR_SCHANNEL
 ################################################
 # Start SUBSYSTEM SCHANNELDB
 [SUBSYSTEM::SCHANNELDB]
+PRIVATE_PROTO_HEADER = schannel_state.h
 OBJ_FILES = \
 		schannel_state.o
 #

source4/auth/gensec/schannel.c

@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_schannel.h"
 #include "auth/auth.h"
 #include "auth/gensec/schannel.h"
+#include "auth/gensec/schannel_state.h"
 #include "auth/gensec/schannel_proto.h"
 
 static size_t schannel_sig_size(struct gensec_security *gensec_security, size_t data_size)

source4/include/includes.h

@@ -123,6 +123,7 @@ enum brl_type {
 #include "libcli/raw/interfaces.h"
 #include "auth/credentials/credentials.h"
 #include "libcli/nbt/libnbt.h"
+#include "libcli/util/proto.h"
 
 #undef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2)

source4/lib/cmdline/config.mk

@@ -1,4 +1,5 @@
 [SUBSYSTEM::LIBCMDLINE_CREDENTIALS]
+PRIVATE_PROTO_HEADER = credentials.h
 OBJ_FILES = credentials.o
 REQUIRED_SUBSYSTEMS = CREDENTIALS
 

source4/lib/cmdline/popt_credentials.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
+#include "lib/cmdline/credentials.h"
 #include "auth/gensec/gensec.h"
 
 /* Handle command line options:

source4/lib/ldb/config.mk

@@ -172,7 +172,7 @@ OBJ_FILES = \
 ################################################
 # Start SUBSYSTEM LIBLDB_CMDLINE
 [SUBSYSTEM::LIBLDB_CMDLINE]
-NOPROTO = NO
+NOPROTO = YES
 OBJ_FILES= \
 		tools/cmdline.o
 REQUIRED_SUBSYSTEMS = LIBLDB LIBBASIC LIBPOPT POPT_SAMBA POPT_CREDENTIALS

source4/libcli/config.mk

@@ -3,6 +3,7 @@ include ldap/config.mk
 include security/config.mk
 
 [SUBSYSTEM::LIBCLI_UTILS]
+PRIVATE_PROTO_HEADER = util/proto.h
 PUBLIC_HEADERS = util/nterr.h util/doserr.h util/nt_status.h
 OBJ_FILES = util/asn1.o \
 		util/doserr.o \
@@ -92,6 +93,7 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = LIBCLI_NBT LIBNETIF
 
 [SUBSYSTEM::LIBCLI_FINDDCS]
+PRIVATE_PROTO_HEADER = finddcs.h
 OBJ_FILES = \
 	finddcs.o
 REQUIRED_SUBSYSTEMS = LIBCLI_NBT MESSAGING

source4/libnet/libnet_lookup.c

@@ -29,6 +29,7 @@
 #include "lib/messaging/messaging.h"
 #include "lib/messaging/irpc.h"
 #include "libcli/resolve/resolve.h"
+#include "libcli/finddcs.h"
 
 struct lookup_state {
 	struct composite_context *resolve_ctx;

source4/main.mk

@@ -248,6 +248,7 @@ include/includes.h: \
 		lib/util/util_proto.h \
 		lib/charset/charset.h \
 		param/param.h \
+		libcli/util/proto.h
 
 clean_pch: 
 	-rm -f include/includes.h.gch

source4/passdb/config.mk

@@ -1,3 +1,4 @@
 [SUBSYSTEM::SECRETS]
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = secrets.o
 REQUIRED_SUBSYSTEMS = SAMDB

source4/passdb/secrets.h

@@ -35,4 +35,6 @@ struct machine_acct_pass {
 #define SECRETS_KRBTGT_SEARCH "(&((|(realm=%s)(flatname=%s))(samAccountName=krbtgt)))"
 #define SECRETS_PRINCIPAL_SEARCH "(&(|(realm=%s)(flatname=%s))(servicePrincipalName=%s))"
 
+#include "passdb/proto.h"
+
 #endif /* _SECRETS_H */

source4/rpc_server/lsa/dcesrv_lsa.c

@@ -30,6 +30,7 @@
 #include "libcli/security/proto.h"
 #include "libcli/auth/proto.h"
 #include "ntvfs/ntvfs.h"
+#include "passdb/secrets.h"
 #include "db_wrap.h"
 
 /*

source4/rpc_server/netlogon/dcerpc_netlogon.c

@@ -30,6 +30,7 @@
 #include "rpc_server/samr/proto.h"
 #include "db_wrap.h"
 #include "libcli/auth/proto.h"
+#include "auth/gensec/schannel_state.h"
 
 struct server_pipe_state {
 	struct netr_Credential client_challenge;

source4/smbd/process_standard.c

@@ -27,10 +27,12 @@
 #include "lib/tdb/include/tdb.h"
 #include "smb_server/smb_server.h"
 
-/* For sepecifiying event context to GSSAPI below */
+/* For specifiying event context to GSSAPI below */
 #include "system/kerberos.h"
 #include "heimdal/lib/gssapi/gssapi_locl.h"
 
+#include "passdb/secrets.h"
+
 /*
   called when the process model is selected
 */

source4/smbd/server.c

@@ -36,6 +36,7 @@
 #include "auth/gensec/gensec.h"
 #include "smbd/process_model.h"
 #include "smbd/service.h"
+#include "passdb/secrets.h"
 
 /*
   recursively delete a directory tree

source4/winbind/wb_samba3_cmd.c

@@ -29,6 +29,7 @@
 #include "version.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "libcli/security/proto.h"
+#include "auth/pam_errors.h"
 
 /* 
    Send off the reply to an async Samba3 query, handling filling in the PAM, NTSTATUS and string errors.

source4/winbind/wb_server.c

@@ -31,6 +31,7 @@
 #include "winbind/wb_server.h"
 #include "lib/stream/packet.h"
 #include "smbd/service.h"
+#include "passdb/secrets.h"
 
 void wbsrv_terminate_connection(struct wbsrv_connection *wbconn, const char *reason)
 {