r13924: Split more prototypes out of include/proto.h + initial work on header

file dependencies
(This used to be commit 122835876748a3eaf5e8d31ad1abddab9acb8781)

16 files changed, 19 insertions, 3 deletions

diff --git a/source4/auth/auth_developer.c b/source4/auth/auth_developer.c
index 14e005efc9..6cbba4ca7a 100644
--- a/source4/auth/auth_developer.c
+++ b/source4/auth/auth_developer.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "auth/auth.h"
+#include "libcli/security/proto.h"
 
 /** 
  * Return an error based on username
diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c
index f1ea2a783c..db683fda79 100644
--- a/source4/auth/auth_sam.c
+++ b/source4/auth/auth_sam.c
@@ -24,6 +24,8 @@
 #include "system/time.h"
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
+#include "db_wrap.h"
+#include "libcli/security/proto.h"
 #include "libcli/ldap/ldap.h"
 
 static const char *user_attrs[] = {
diff --git a/source4/auth/auth_sam_reply.c b/source4/auth/auth_sam_reply.c
index 89b389aa83..5ba2ab4306 100644
--- a/source4/auth/auth_sam_reply.c
+++ b/source4/auth/auth_sam_reply.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "auth/auth.h"
+#include "libcli/security/proto.h"
 
 NTSTATUS auth_convert_server_info_sambaseinfo(TALLOC_CTX *mem_ctx, 
 					      struct auth_serversupplied_info *server_info, 
diff --git a/source4/auth/auth_util.c b/source4/auth/auth_util.c
index 1ff2f8ccc4..86f1573340 100644
--- a/source4/auth/auth_util.c
+++ b/source4/auth/auth_util.c
@@ -24,6 +24,8 @@
 
 #include "includes.h"
 #include "auth/auth.h"
+#include "libcli/security/proto.h"
+#include "libcli/auth/proto.h"
 
 /* this default function can be used by mostly all backends
  * which don't want to set a challlenge
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 9c14528572..56bc28c840 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -7,9 +7,9 @@ include credentials/config.mk
 #######################
 # Start MODULE auth_sam
 [MODULE::auth_sam]
+PRIVATE_PROTO_HEADER = auth_sam.h
 INIT_FUNCTION = auth_sam_init
 SUBSYSTEM = AUTH
-NOPROTO = NO
 OBJ_FILES = \
 		auth_sam.o
 REQUIRED_SUBSYSTEMS = \
diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c
index b1554cc9ef..4162c2a10a 100644
--- a/source4/auth/credentials/credentials.c
+++ b/source4/auth/credentials/credentials.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
 #include "auth/gensec/gensec.h"
+#include "libcli/auth/proto.h"
 
 /**
  * Create a new credentials structure
diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c
index 53350b8ed0..c4e384c2cd 100644
--- a/source4/auth/credentials/credentials_files.c
+++ b/source4/auth/credentials/credentials_files.c
@@ -27,6 +27,7 @@
 #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
 #include "passdb/secrets.h"
 #include "system/filesys.h"
+#include "db_wrap.h"
 
 /**
  * Read a file descriptor, and parse it for a password (eg from a file or stdin)
diff --git a/source4/auth/credentials/credentials_ntlm.c b/source4/auth/credentials/credentials_ntlm.c
index 5068540a32..eafd5e00a2 100644
--- a/source4/auth/credentials/credentials_ntlm.c
+++ b/source4/auth/credentials/credentials_ntlm.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
 #include "lib/crypto/crypto.h"
+#include "libcli/auth/proto.h"
 
 void cli_credentials_get_ntlm_username_domain(struct cli_credentials *cred, TALLOC_CTX *mem_ctx, 
 					      const char **username, 
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index eab8211525..580b7a7be1 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -27,6 +27,7 @@
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "auth/auth.h"
+#include "auth/auth_sam.h"
 
 enum gensec_gssapi_sasl_state 
 {
diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c
index a52ea1b686..200822655d 100644
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -29,6 +29,7 @@
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "auth/auth.h"
+#include "auth/auth_sam.h"
 #include "system/network.h"
 #include "lib/socket/socket.h"
 
diff --git a/source4/auth/gensec/schannel_state.c b/source4/auth/gensec/schannel_state.c
index beaa8cfb08..b9cee49f5a 100644
--- a/source4/auth/gensec/schannel_state.c
+++ b/source4/auth/gensec/schannel_state.c
@@ -25,8 +25,9 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "dsdb/samdb/samdb.h"
+#include "db_wrap.h"
 
-/*
+/**
   connect to the schannel ldb
 */
 struct ldb_context *schannel_db_connect(TALLOC_CTX *mem_ctx)
diff --git a/source4/auth/ntlm_check.c b/source4/auth/ntlm_check.c
index 5a08cf5f09..390caa0071 100644
--- a/source4/auth/ntlm_check.c
+++ b/source4/auth/ntlm_check.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/crypto/crypto.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "libcli/auth/proto.h"
 
 /****************************************************************************
  Core of smb password checking routine.
diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
index 32b917e4ce..55a9e09971 100644
--- a/source4/auth/ntlmssp/config.mk
+++ b/source4/auth/ntlmssp/config.mk
@@ -4,6 +4,7 @@
 SUBSYSTEM = GENSEC
 NOPROTO = NO
 INIT_FUNCTION = gensec_ntlmssp_init
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = ntlmssp.o \
 		ntlmssp_sign.o \
 		ntlmssp_client.o \
diff --git a/source4/auth/ntlmssp/ntlmssp.h b/source4/auth/ntlmssp/ntlmssp.h
index 640d2d57fe..721d05149e 100644
--- a/source4/auth/ntlmssp/ntlmssp.h
+++ b/source4/auth/ntlmssp/ntlmssp.h
@@ -185,4 +185,4 @@ struct gensec_ntlmssp_state
 	struct auth_serversupplied_info *server_info;
 };
 
-
+#include "auth/ntlmssp/proto.h"
diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c
index c2a1e1cde8..cc7a376643 100644
--- a/source4/auth/ntlmssp/ntlmssp_client.c
+++ b/source4/auth/ntlmssp/ntlmssp_client.c
@@ -26,6 +26,7 @@
 #include "auth/auth.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "lib/crypto/crypto.h"
+#include "libcli/auth/proto.h"
 
 /*********************************************************************
  Client side NTLMSSP
diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c
index 65956d0580..54eb7f9bff 100644
--- a/source4/auth/ntlmssp/ntlmssp_server.c
+++ b/source4/auth/ntlmssp/ntlmssp_server.c
@@ -28,6 +28,7 @@
 #include "lib/crypto/crypto.h"
 #include "pstring.h"
 #include "system/filesys.h"
+#include "libcli/auth/proto.h"
 
 /** 
  * Set a username on an NTLMSSP context - ensures it is talloc()ed