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

file dependencies
(This used to be commit 122835876748a3eaf5e8d31ad1abddab9acb8781)

diff --git a/source4/auth/auth_developer.c b/source4/auth/auth_developer.c
index 14e005efc9e54ca0b96886b0f191fae9642371d1..6cbba4ca7af415dc82b13a2adaa0fa94467cd61d 100644 (file)
--- 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 f1ea2a783ce024dea80d7cca881d107f3aaaae85..db683fda790c1494a97e0287c67cde425a88af7c 100644 (file)
--- 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 89b389aa83642e343c74cea36df9abcc98e6a297..5ba2ab43064daf8c9ce7ece8d3df72f7ce6d8114 100644 (file)
--- 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 1ff2f8ccc49b4ef546636ecd5891e839f8ada9ce..86f157334090b903e1da03d3c7810223e381f46e 100644 (file)
--- 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 9c14528572ade25bf41bd4df83fb0a6c8da6a226..56bc28c8409380bb335d1f2725b6272d815b5f89 100644 (file)
--- 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 b1554cc9efb1dcbe14c43a1216114e1545f71d2e..4162c2a10a15a12f193e80100f637577936f360e 100644 (file)
--- 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 53350b8ed0af5eca8c43089fd84da404da492f43..c4e384c2cd34adfe31f5aebe19282deae0261de5 100644 (file)
--- 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 5068540a3274ca848926acffc751c49b8b7c1b3a..eafd5e00a2ab7a84561eba060b168c29bde5e7f4 100644 (file)
--- 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 eab8211525a66722fb1091fafee11b0f1d5e32cd..580b7a7be1bfeb11bfaba3356ec32b2355345310 100644 (file)
--- 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 a52ea1b686d848991affd0a4ef5502ceb964d73b..200822655d1b251c31166df785539db49dd02a19 100644 (file)
--- 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 beaa8cfb08b7cd25eb3d6665446e496cfb19e624..b9cee49f5afab4c249b9dcda228a15a1b024b106 100644 (file)
--- 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 5a08cf5f09d9cece4939b1623da6835aa2f25a8c..390caa0071aee7e843388243b959023edc3bc096 100644 (file)
--- 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 32b917e4ce940774f15fca99e22470a38f019878..55a9e099717b70ff2175163840cf0e4fa9ded72f 100644 (file)
--- 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 640d2d57fe00f4b38d62edbe693836acbee13800..721d05149e06696daae6ad1c650c9825f90382ee 100644 (file)
--- 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 c2a1e1cde8086c397c7c8500db2192261f42ae0e..cc7a37664348785edae4d5d0a5be09ff8910eba1 100644 (file)
--- 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 65956d0580101a1e5337a178a5e26caea1dde073..54eb7f9bff963c794ed0cb2b2b06374b8f23b588 100644 (file)
--- 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 

diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index 05893b62de8ee8e3574aa7818427b4e7ccf00ce9..6b5ebbb8ba6056a66b40961b5af6f55255285fd7 100644 (file)
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -1,3 +1,7 @@
+- for each subsystem:
+ - include line in Makefile
+ - rule in Makefile
+ - 
 - sonames
 - get rid of include/structs.h
 - add register function to smbtorture

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 83befe7c678845468ba30c353e57fb7a213f3ac6..bf11e8c896cb5bb4685e28d2f861216e31342129 100644 (file)
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -77,6 +77,7 @@ foreach my $key (values %$OUTPUT) {
        $mkenv->Header($key) if defined($key->{PUBLIC_HEADERS});
        $mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER});
 
+#      $mkenv->DependencyInfo($key) if $config::config{developer} eq "yes";
 }
 
 $mkenv->write("Makefile");

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index b7c3a273832cb240234d95b0fdb40c4e18353257..0638c0ac30b6481109508355d2b4bdfe17ce413a 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -239,6 +239,18 @@ sub _prepare_list($$$)
        $self->output("$ctx->{TYPE}\_$ctx->{NAME}_$var =$tmplist\n");
 }
 
+sub DependencyInfo($$)
+{
+       my ($self,$ctx) = @_;
+
+       $self->output("bin/deps/$ctx->{TYPE}_$ctx->{NAME}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST:.o=.c)");
+       $self->output("\n");
+       $self->output("\t\@echo \"Generating dependency info for $ctx->{NAME}\"\n");
+       $self->output("\t\@./script/cdeps.pl \$^ > \$@\n");
+       $self->output("\n");
+       $self->output("-include bin/deps/$ctx->{TYPE}_$ctx->{NAME}\n\n");
+}
+
 sub SharedLibrary($$)
 {
        my ($self,$ctx) = @_;

diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index 7270e01a4de209700fed7ba5206af20398d1324b..f522995bc4910c0f7833242d2869ee6f7223dac9 100644 (file)
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -26,6 +26,8 @@
 #include "lib/messaging/irpc.h"
 #include "smbd/service_task.h"
 #include "cldap_server/cldap_server.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   handle incoming cldap requests
@@ -95,7 +97,7 @@ static NTSTATUS cldapd_add_socket(struct cldapd_server *cldapd, const char *addr
 /*
   setup our listening sockets on the configured network interfaces
 */
-NTSTATUS cldapd_startup_interfaces(struct cldapd_server *cldapd)
+static NTSTATUS cldapd_startup_interfaces(struct cldapd_server *cldapd)
 {
        int num_interfaces = iface_count();
        TALLOC_CTX *tmp_ctx = talloc_new(cldapd);

diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index 476b9dfed5457217a52535dc837bafe8f586286c..45a69304517e3c62923cc0a371004366bea0d69d 100644 (file)
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -28,6 +28,9 @@
 #include "cldap_server/cldap_server.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
+#include "db_wrap.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   fill in the cldap netlogon union for a given version

diff --git a/source4/client/client.c b/source4/client/client.c
index 077ca351c1fa89711dbed0a55b0456b6cbba127f..83a2b750b699fbdc3433d1a7c63a074298032710 100644 (file)
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -34,6 +34,8 @@
 #include "system/readline.h"
 #include "auth/gensec/gensec.h"
 #include "system/time.h" /* needed by some systems for asctime() */
+#include "libcli/resolve/resolve.h"
+#include "libcli/security/proto.h"
 
 static int io_bufsize = 64512;
 

diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index d886894483139c9e966cc93aecebefe162541447..60e914e6775465d235003903b7f254ff9499228d 100644 (file)
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -30,7 +30,9 @@
 #include "auth/kerberos/kerberos.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/ldap/ldap.h"
+#include "libcli/security/proto.h"
 #include "auth/auth.h"
+#include "db_wrap.h"
 
 static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                                   struct smb_krb5_context *smb_krb5_context,

diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
index 4c680df3e6132256b2fae894854e09d7ca43e935..24866a9e45143ad9220059c4482c42cccf7fd1cf 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
+++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
@@ -35,6 +35,7 @@
 #include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_private.h"
 #include "auth/auth.h"
+#include "libcli/security/proto.h"
 
 /* Kludge ACL rules:
  *

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 0530c63774e22c9c5a2462e12c075908f9bb8636..2abf060a0f6b6b7c7a6454c354d404b4092fd984 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -36,6 +36,7 @@
 #include "ldb/include/ldb_private.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "libcli/auth/proto.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
 #include "system/time.h"

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 3355df4e23c1742d6eae536cd1cd7fedc36a056f..4be91a6cfb65b047261800aa4a2b0210d5d3eccb 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -38,6 +38,8 @@
 #include "lib/ldb/include/ldb_errors.h"
 #include "lib/ldb/include/ldb_private.h"
 #include "dsdb/samdb/samdb.h"
+#include "libcli/security/proto.h"
+#include "db_wrap.h"
 
 
 /* if value is not null also check for attribute to have exactly that value */

diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index fe82b380c5d48866417567da7119210a541f55e7..358f565283a36318f5671bfd31cde661cdef743f 100644 (file)
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
+#include "libcli/security/proto.h"
 #include "system/time.h"
 #include "system/filesys.h"
 #include "db_wrap.h"

diff --git a/source4/dsdb/samdb/samdb_privilege.c b/source4/dsdb/samdb/samdb_privilege.c
index 33d53e56e87d9c906c0447e08c501c79042dcde6..0cf2e9c0a946601c9f18040684fe22adcb22a338 100644 (file)
--- a/source4/dsdb/samdb/samdb_privilege.c
+++ b/source4/dsdb/samdb/samdb_privilege.c
@@ -24,6 +24,8 @@
 #include "libcli/ldap/ldap.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
+#include "libcli/security/proto.h"
+#include "db_wrap.h"
 
 /*
   add privilege bits for one sid to a security_token

diff --git a/source4/heimdal_build/glue.c b/source4/heimdal_build/glue.c
index 819a395ca8118cbc40654da961e09edd6d4532b5..bf64360c433627b293bf4b780ed596a44b62d6c8 100644 (file)
--- a/source4/heimdal_build/glue.c
+++ b/source4/heimdal_build/glue.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "system/network.h"
 #include "system/kerberos.h"
+#include "netif/netif.h"
 
 /*
   get the list of IP addresses for configured interfaces

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 60e3fb034bc0813ed6a8f71fd3d3135389ec2b2e..adf4d37016f5ff3c5613decdc35ba02b84b61b0e 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -105,7 +105,7 @@ enum brl_type {
 #include "lib/replace/replace.h"
 
 /* Lists, trees, caching, database... */
-#include "nt_status.h"
+#include "libcli/util/nt_status.h"
 #include "talloc/talloc.h"
 #include "core.h"
 #include "charset/charset.h"

diff --git a/source4/kdc/hdb-ldb.c b/source4/kdc/hdb-ldb.c
index 5766a9acfa30000bdd920aedbab94c63f0a01995..742c0671943310be787c191c1067d09942bbba41 100644 (file)
--- a/source4/kdc/hdb-ldb.c
+++ b/source4/kdc/hdb-ldb.c
@@ -41,6 +41,8 @@
 #include "system/iconv.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "auth/auth.h"
+#include "auth/auth_sam.h"
+#include "db_wrap.h"
 #include "dsdb/samdb/samdb.h"
 
 enum hdb_ldb_ent_type 

diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 8492d5a7eb10303bfb49c518c3807747f43cfc2e..77ed9b6f15c8ccfe8ce3cbb4cf15d8f2bd75e93f 100644 (file)
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"
+#include "smbd/process_model.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
 #include "kdc/kdc.h"
@@ -32,8 +33,8 @@
 #include "dlinklist.h"
 #include "lib/messaging/irpc.h"
 #include "lib/stream/packet.h"
-
 #include "librpc/gen_ndr/samr.h"
+#include "netif/netif.h"
 
 /* hold all the info needed to send a reply */
 struct kdc_reply {

diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index a9c12b8ee639a3b06b65d2254911a29cb4f4c6ec..ca5f37fa796c8e5de697685de52b2125c9a56483 100644 (file)
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -28,6 +28,7 @@
 #include "heimdal/lib/krb5/krb5_locl.h"
 #include "librpc/gen_ndr/krb5pac.h"
 #include "auth/auth.h"
+#include "auth/auth_sam.h"
 
 /* Given the right private pointer from hdb_ldb, get a PAC from the attached ldb messages */
 static krb5_error_code samba_get_pac(krb5_context context, 

diff --git a/source4/ldap_server/config.mk b/source4/ldap_server/config.mk
index 826597cdcb2b3294b387e9b5c93ccf9fb4716237..3b7cf04d68483868ae28d3f0b3ba3001d39f1b65 100644 (file)
--- a/source4/ldap_server/config.mk
+++ b/source4/ldap_server/config.mk
@@ -3,6 +3,7 @@
 #######################
 # Start SUBSYSTEM LDAP
 [SUBSYSTEM::LDAP]
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
                ldap_server.o \
                ldap_backend.o \

diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index a6786e2990414cff304d65cd3d6598832c5ac28d..b1ef4ff006357a979fc9a57eda5c103b88d1f386 100644 (file)
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -36,6 +36,8 @@
 #include "lib/stream/packet.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   close the socket and shutdown a server_context

diff --git a/source4/ldap_server/ldap_server.h b/source4/ldap_server/ldap_server.h
index f71c703088653c309d736e10c2ab33585e579c12..10c93f661043898704c0c5729026304adbbb5734 100644 (file)
--- a/source4/ldap_server/ldap_server.h
+++ b/source4/ldap_server/ldap_server.h
@@ -60,3 +60,5 @@ struct ldapsrv_service;
 struct ldapsrv_service {
        struct tls_params *tls_params;
 };
+
+#include "ldap_server/proto.h"

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index b57de3f6ef5917c321d4384bda68c1048284e90c..50ed8cc02f19c5825e4787e19898bb1b8a6cc60f 100644 (file)
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -22,6 +22,7 @@ include tdr/config.mk
 ##############################
 # Start SUBSYSTEM LIBNETIF
 [SUBSYSTEM::LIBNETIF]
+PRIVATE_PROTO_HEADER = netif/proto.h
 OBJ_FILES = \
                netif/interface.o \
                netif/netif.o
@@ -55,6 +56,7 @@ OBJ_FILES = \
                gencache/gencache.o \
 
 [SUBSYSTEM::DB_WRAP]
+PRIVATE_PROTO_HEADER = db_wrap_proto.h
 OBJ_FILES = db_wrap.o \
                gendb.o
 REQUIRED_SUBSYSTEMS = LIBLDB LIBTDB LDBSAMBA

diff --git a/source4/lib/db_wrap.h b/source4/lib/db_wrap.h
index 48e1bbc9e1c165cb6468d89df9e324c5860aeb07..1af2cd2e2a2ab0c8e0e9e0bfabd36809aae1d4cc 100644 (file)
--- a/source4/lib/db_wrap.h
+++ b/source4/lib/db_wrap.h
@@ -28,3 +28,4 @@ struct tdb_wrap {
        struct tdb_wrap *next, *prev;
 };
 
+#include "db_wrap_proto.h"

diff --git a/source4/lib/ldb/samba/ldif_handlers.c b/source4/lib/ldb/samba/ldif_handlers.c
index df4b5e9c3bd767bdc59a4c550ed4d89b762483a0..e57cd970b110671fa72193ef56dc81d1ec925337 100644 (file)
--- a/source4/lib/ldb/samba/ldif_handlers.c
+++ b/source4/lib/ldb/samba/ldif_handlers.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "dsdb/samdb/samdb.h"
+#include "libcli/security/proto.h"
 
 /*
   convert a ldif formatted objectSid to a NDR formatted blob

diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index 8f803c51189b9c54042b66e65017d71d8b9fbda8..2874818160d4900118ddf47955fdb7bf1ebb58fc 100644 (file)
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -29,6 +29,7 @@
 #ifdef _SAMBA_BUILD_
 #include "lib/cmdline/popt_common.h"
 #include "auth/auth.h"
+#include "db_wrap.h"
 #endif
 
 /*

diff --git a/source4/lib/netif/interface.c b/source4/lib/netif/interface.c
index 8d738f6c410e9af42ad483fd37e11e6d65dd455b..019b05cfbbe12fc79ba52b15bae619b51e790159 100644 (file)
--- a/source4/lib/netif/interface.c
+++ b/source4/lib/netif/interface.c
@@ -25,7 +25,7 @@
 #include "lib/netif/netif.h"
 #include "dlinklist.h"
 
-/* used for network interfaces */
+/** used for network interfaces */
 struct interface {
        struct interface *next, *prev;
        struct ipv4_addr ip;
@@ -105,7 +105,7 @@ static void add_interface(struct in_addr ip, struct in_addr nmask)
 
 
 
-/****************************************************************************
+/**
 interpret a single element from a interfaces= config line 
 
 This handles the following different forms:
@@ -115,7 +115,7 @@ This handles the following different forms:
 3) IP/masklen
 4) ip/mask
 5) bcast/mask
-****************************************************************************/
+**/
 static void interpret_interface(const char *token, 
                                struct iface_struct *probed_ifaces, 
                                int total_probed)
@@ -184,9 +184,9 @@ static void interpret_interface(const char *token,
 }
 
 
-/****************************************************************************
+/**
 load the list of network interfaces
-****************************************************************************/
+**/
 static void load_interfaces(void)
 {
        const char **ptr;
@@ -230,19 +230,19 @@ static void load_interfaces(void)
 }
 
 
-/*
+/**
   unload the interfaces list, so it can be reloaded when needed
 */
-_PUBLIC_ void unload_interfaces(void)
+void unload_interfaces(void)
 {
        talloc_free(local_interfaces);
        local_interfaces = NULL;
 }
 
-/****************************************************************************
+/**
   how many interfaces do we have
-  **************************************************************************/
-_PUBLIC_ int iface_count(void)
+  **/
+int iface_count(void)
 {
        int ret = 0;
        struct interface *i;
@@ -254,10 +254,10 @@ _PUBLIC_ int iface_count(void)
        return ret;
 }
 
-/****************************************************************************
+/**
   return IP of the Nth interface
-  **************************************************************************/
-_PUBLIC_ const char *iface_n_ip(int n)
+  **/
+const char *iface_n_ip(int n)
 {
        struct interface *i;
   
@@ -272,10 +272,10 @@ _PUBLIC_ const char *iface_n_ip(int n)
        return NULL;
 }
 
-/****************************************************************************
+/**
   return bcast of the Nth interface
-  **************************************************************************/
-_PUBLIC_ const char *iface_n_bcast(int n)
+  **/
+const char *iface_n_bcast(int n)
 {
        struct interface *i;
   
@@ -290,10 +290,10 @@ _PUBLIC_ const char *iface_n_bcast(int n)
        return NULL;
 }
 
-/****************************************************************************
+/**
   return netmask of the Nth interface
-  **************************************************************************/
-_PUBLIC_ const char *iface_n_netmask(int n)
+  **/
+const char *iface_n_netmask(int n)
 {
        struct interface *i;
   
@@ -308,11 +308,11 @@ _PUBLIC_ const char *iface_n_netmask(int n)
        return NULL;
 }
 
-/*
+/**
   return the local IP address that best matches a destination IP, or
   our first interface if none match
 */
-_PUBLIC_ const char *iface_best_ip(const char *dest)
+const char *iface_best_ip(const char *dest)
 {
        struct interface *iface;
        struct in_addr ip;
@@ -327,10 +327,10 @@ _PUBLIC_ const char *iface_best_ip(const char *dest)
        return iface_n_ip(0);
 }
 
-/*
+/**
   return True if an IP is one one of our local networks
 */
-_PUBLIC_ BOOL iface_is_local(const char *dest)
+BOOL iface_is_local(const char *dest)
 {
        struct in_addr ip;
 
@@ -343,10 +343,10 @@ _PUBLIC_ BOOL iface_is_local(const char *dest)
        return False;
 }
 
-/*
+/**
   return True if a IP matches a IP/netmask pair
 */
-_PUBLIC_ BOOL iface_same_net(const char *ip1, const char *ip2, const char *netmask)
+BOOL iface_same_net(const char *ip1, const char *ip2, const char *netmask)
 {
        return same_net(interpret_addr2(ip1),
                        interpret_addr2(ip2),

diff --git a/source4/lib/netif/netif.c b/source4/lib/netif/netif.c
index 8256615ef2b0750cb1fc013496c28ef8bbacfc71..0344febf3806e40c8028a0cd0a550c20c479bc0c 100644 (file)
--- a/source4/lib/netif/netif.c
+++ b/source4/lib/netif/netif.c
@@ -77,6 +77,7 @@
 #endif
 
 #include <net/if.h>
+#define BOOL int
 #include "netif.h"
 
 #if HAVE_IFACE_IFCONF

diff --git a/source4/lib/netif/netif.h b/source4/lib/netif/netif.h
index 7efe5a9b19831114d970425d5cdc8f677dcf56ef..77b78096854402c42448c35614951e9fd5608ce7 100644 (file)
--- a/source4/lib/netif/netif.h
+++ b/source4/lib/netif/netif.h
@@ -28,3 +28,4 @@ struct iface_struct {
 
 #define MAX_INTERFACES 128
 
+#include "netif/proto.h"

diff --git a/source4/lib/samba3/group.c b/source4/lib/samba3/group.c
index eea70c8530ba3f10851874f24c5e0dc67ef125e2..74190e24ea919002f385b3e97bb695fa60187ec1 100644 (file)
--- a/source4/lib/samba3/group.c
+++ b/source4/lib/samba3/group.c
@@ -24,6 +24,7 @@
 #include "lib/samba3/samba3.h"
 #include "lib/tdb/include/tdbutil.h"
 #include "system/filesys.h"
+#include "libcli/security/proto.h"
 
 #define DATABASE_VERSION_V1 1 /* native byte format. */
 #define DATABASE_VERSION_V2 2 /* le format. */

diff --git a/source4/lib/samba3/idmap.c b/source4/lib/samba3/idmap.c
index 205089f1cc846847fcd87ed8daa0bdead61f180a..6958f8d004e47f49be28355c2e0dbb3e2cbbd1c8 100644 (file)
--- a/source4/lib/samba3/idmap.c
+++ b/source4/lib/samba3/idmap.c
@@ -27,6 +27,7 @@
 #include "lib/tdb/include/tdbutil.h"
 #include "lib/samba3/samba3.h"
 #include "system/filesys.h"
+#include "libcli/security/proto.h"
 
 /* High water mark keys */
 #define HWM_GROUP  "GROUP HWM"

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index dc64198caa2336f644449d5e70bd6463a4978b4e..a74e2a67e635dc118b12b16ddf2a4c0408240b1f 100644 (file)
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -26,6 +26,7 @@
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 #include "libcli/composite/composite.h"
+#include "libcli/resolve/resolve.h"
 
 
 struct connect_state {

diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c
index 73964350753bca49d15925f6a4b111855e24282f..9f060767af6b506d560797fbc20fc153283248a1 100644 (file)
--- a/source4/lib/socket/connect_multi.c
+++ b/source4/lib/socket/connect_multi.c
@@ -26,6 +26,7 @@
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 #include "libcli/composite/composite.h"
+#include "libcli/resolve/resolve.h"
 
 #define MULTI_PORT_DELAY 2000 /* microseconds */
 

diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk
index 0d8c21d5274077c99139baf551272727b8f1346a..c879c60956c998639a05286495fd3173615567b2 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]
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = credentials.o \
                session.o \
                smbencrypt.o 

diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c
index 12c5d2dfb6e08994984640aed84210eb2a2cb8e8..0ebd78fa7f40f468837c49415a6bbdeb3dc1514e 100644 (file)
--- a/source4/libcli/auth/smbencrypt.c
+++ b/source4/libcli/auth/smbencrypt.c
@@ -27,6 +27,7 @@
 #include "smb.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "lib/crypto/crypto.h"
+#include "libcli/auth/proto.h"
 #include "pstring.h"
 
 /*

diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index 490a03d50e835debd8ec66bc491da6d455cf334a..9e407ba2006e6353125fc35fdede4a9a21a9c730 100644 (file)
--- a/source4/libcli/cldap/cldap.c
+++ b/source4/libcli/cldap/cldap.c
@@ -38,6 +38,7 @@
 #include "libcli/ldap/ldap.h"
 #include "libcli/cldap/cldap.h"
 #include "lib/socket/socket.h"
+#include "libcli/security/proto.h"
 
 /*
   destroy a pending request

diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index 8103208a2608416ec559ab23defb60410bc6a95a..8616e42cd48b0bdc5a551631f2118084d3544a91 100644 (file)
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/auth/proto.h"
 #include "libcli/smb_composite/smb_composite.h"
 
 /*

diff --git a/source4/libcli/composite/composite.h b/source4/libcli/composite/composite.h
index 26490f1c4a2c5b8143bb49268cedafd72e634048..d1299d77c1f07eb79929f056d127425e12b70580 100644 (file)
--- a/source4/libcli/composite/composite.h
+++ b/source4/libcli/composite/composite.h
@@ -60,3 +60,5 @@ struct composite_context {
 
        BOOL used_wait;
 };
+
+#include "libcli/composite/proto.h"

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index b431922de761fdf55ef8ed137db6da9894d83b4c..71adaaa8c9259e77c1048de44af9e85c3e6310e7 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -16,11 +16,13 @@ OBJ_FILES = util/clilsa.o
 REQUIRED_SUBSYSTEMS = RPC_NDR_LSA
 
 [SUBSYSTEM::LIBCLI_COMPOSITE]
+PRIVATE_PROTO_HEADER = composite/proto.h
 OBJ_FILES = \
        composite/composite.o
 REQUIRED_SUBSYSTEMS = LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_SMB_COMPOSITE]
+PRIVATE_PROTO_HEADER = smb_composite/proto.h
 OBJ_FILES = \
        smb_composite/loadfile.o \
        smb_composite/savefile.o \
@@ -80,6 +82,7 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = NDR_WINSREPL SOCKET LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_RESOLVE]
+PRIVATE_PROTO_HEADER = resolve/resolve.h
 OBJ_FILES = \
        resolve/resolve.o \
        resolve/nbtlist.o \

diff --git a/source4/libcli/dgram/browse.c b/source4/libcli/dgram/browse.c
index 25cee387c4150e73623a1aadf6e50a0213c4f08b..f67e561afcf593ee548568bbfd480bbe00f792bc 100644 (file)
--- a/source4/libcli/dgram/browse.c
+++ b/source4/libcli/dgram/browse.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
 
 NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket *dgmsock,
                                    struct nbt_name *dest_name,

diff --git a/source4/libcli/dgram/netlogon.c b/source4/libcli/dgram/netlogon.c
index 6ad4c28811866dde2d8358f6a936200671be1016..df8c63fa8783f869ed2079b71d7b86c0c4788aa1 100644 (file)
--- a/source4/libcli/dgram/netlogon.c
+++ b/source4/libcli/dgram/netlogon.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
 
 /* 
    send a netlogon mailslot request 

diff --git a/source4/libcli/dgram/ntlogon.c b/source4/libcli/dgram/ntlogon.c
index ecd6bd4587b44e3e37e3626c773de86bb965910e..84ad814fa03baec2718679ac7af4393ff696d84b 100644 (file)
--- a/source4/libcli/dgram/ntlogon.c
+++ b/source4/libcli/dgram/ntlogon.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
 
 /* 
    send a ntlogon mailslot request 

diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c
index 9caf9b55782415158473862a26d81af329686dd1..085aa352ac011716bde683ff5e31518aec1892b0 100644 (file)
--- a/source4/libcli/finddcs.c
+++ b/source4/libcli/finddcs.c
@@ -27,6 +27,7 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "libcli/composite/composite.h"
 #include "libcli/libcli.h"
+#include "libcli/resolve/resolve.h"
 
 struct finddcs_state {
        struct composite_context *ctx;

diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c
index 40d9d2784aad427017d079e9580a674798e059db..4b1d70d8d2466bf223001adade9ab18552474a44 100644 (file)
--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@@ -26,6 +26,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
 
 struct sock_connect_state {
        struct composite_context *ctx;

diff --git a/source4/libcli/resolve/bcast.c b/source4/libcli/resolve/bcast.c
index f8ea6b2b3b63ed966a66d11203a7ec7563911d47..1b58918ea795d57eef5d7c341cdcf4fc021b4846 100644 (file)
--- a/source4/libcli/resolve/bcast.c
+++ b/source4/libcli/resolve/bcast.c
@@ -21,6 +21,9 @@
 */
 
 #include "includes.h"
+#include "libcli/resolve/resolve.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   broadcast name resolution method - async send

diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c
index 3af40c1b24bc9ad5593f88e15fee00734151ad1a..e8473966b48eed5f4471d7fbe80b6e1a630c3537 100644 (file)
--- a/source4/libcli/resolve/nbtlist.c
+++ b/source4/libcli/resolve/nbtlist.c
@@ -26,6 +26,8 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 struct nbtlist_state {
        struct nbt_name name;

diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index d3d197e567f01c77a7cd15caf978d6317f194d7a..c3fdf4bc25f1fe6c7a8e18a2588d08474b9670e0 100644 (file)
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "libcli/composite/composite.h"
+#include "libcli/resolve/resolve.h"
 
 struct resolve_state {
        struct nbt_name name;

diff --git a/source4/libcli/resolve/wins.c b/source4/libcli/resolve/wins.c
index b2e0ddae6f38d1fa6a14a0cc1c657c1a0d551e9e..f11033ae4f53ccef6318e6b339c460e24465b052 100644 (file)
--- a/source4/libcli/resolve/wins.c
+++ b/source4/libcli/resolve/wins.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/resolve/resolve.h"
 
 /*
   wins name resolution method - async send

diff --git a/source4/libcli/security/access_check.c b/source4/libcli/security/access_check.c
index 00275d88244ee787c849d3fe4784657f13f32700..9d565363e6c857749862cd66623bcf54d9ed004e 100644 (file)
--- a/source4/libcli/security/access_check.c
+++ b/source4/libcli/security/access_check.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/security/proto.h"
 
 
 /*

diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index a8de4995313205d896d1618324cfa15d9fe9482c..3202def26c5dfcc6e0f9514f461245e24ef50c7e 100644 (file)
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -1,6 +1,7 @@
 #################################
 # Start SUBSYSTEM LIB_SECURITY
 [SUBSYSTEM::LIB_SECURITY]
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = security_token.o \
                security_descriptor.o \
                dom_sid.o \

diff --git a/source4/libcli/security/sddl.c b/source4/libcli/security/sddl.c
index c434072529777bc5a27e6d99e477cd26d00c2b37..a1e9985edd2df28afebcf458c26946e6e8bf5f84 100644 (file)
--- a/source4/libcli/security/sddl.c
+++ b/source4/libcli/security/sddl.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/iconv.h"
+#include "libcli/security/proto.h"
 
 struct flag_map {
        const char *name;

diff --git a/source4/libcli/security/security_descriptor.c b/source4/libcli/security/security_descriptor.c
index 64983e20d060f75c63d2102127af37cdbb75a5a1..20cdeb0ba7cfde0e86b3aef97d4e66332e2d1c92 100644 (file)
--- a/source4/libcli/security/security_descriptor.c
+++ b/source4/libcli/security/security_descriptor.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/security/proto.h"
 
 /*
   return a blank security descriptor (no owners, dacl or sacl)

diff --git a/source4/libcli/security/security_token.c b/source4/libcli/security/security_token.c
index 6774894a86c892e13fddc75375b8f2a59971b8c7..7760ee7c22c089ddbcd60cc5b24b86d8c266ed51 100644 (file)
--- a/source4/libcli/security/security_token.c
+++ b/source4/libcli/security/security_token.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
+#include "libcli/security/proto.h"
 
 /*
   return a blank security token

diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index d15f370feba8d6df8c2be59a641363a3db781910..b185ff7a883c870f479ce9d2138a856f06880d4d 100644 (file)
--- a/source4/libcli/smb2/connect.c
+++ b/source4/libcli/smb2/connect.c
@@ -25,6 +25,7 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "libcli/composite/composite.h"
+#include "libcli/resolve/resolve.h"
 
 struct smb2_connect_state {
        struct cli_credentials *credentials;

diff --git a/source4/libcli/smb_composite/appendacl.c b/source4/libcli/smb_composite/appendacl.c
index c68c0a185df3edd1abea50eb60fada21f7ca6186..0a5b56b90d747da7a87cfe3c4ef6b4da562e5852 100644 (file)
--- a/source4/libcli/smb_composite/appendacl.c
+++ b/source4/libcli/smb_composite/appendacl.c
@@ -1,6 +1,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
+#include "libcli/security/proto.h"
 #include "libcli/smb_composite/smb_composite.h"
 
 /* the stages of this call */

diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index 785b0d076bd2b4f76471a750c7ee7355c84eaa9e..07da2d363a2e08adb415ceb42c6f28b361c67d38 100644 (file)
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -26,6 +26,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/events/events.h"
+#include "libcli/resolve/resolve.h"
 
 /* the stages of this call */
 enum connect_stage {CONNECT_RESOLVE, 

diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c
index bbe6a7edfb33ff70d7e7e56564ba040c0467897f..9e345ab4f87106328f4d1865de39e2638abd0014 100644 (file)
--- a/source4/libcli/smb_composite/sesssetup.c
+++ b/source4/libcli/smb_composite/sesssetup.c
@@ -25,6 +25,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "libcli/auth/proto.h"
 #include "auth/auth.h"
 #include "version.h"
 

diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h
index 7ab012744085c44e0078c547dc47e36cc45125d0..ac34ad40ac790f9106bce9ef8191f214529b8a22 100644 (file)
--- a/source4/libcli/smb_composite/smb_composite.h
+++ b/source4/libcli/smb_composite/smb_composite.h
@@ -170,3 +170,5 @@ struct smb_composite_connectmulti {
                struct smbcli_socket *socket;
        } out;
 };
+
+#include "libcli/smb_composite/proto.h"

diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index bf5048b02a6da83f9d8e1aef02e067f19d906dd7..97aa7e13accd4ec20b83fd89ec23eb11a8923e0a 100644 (file)
--- a/source4/libcli/util/clilsa.c
+++ b/source4/libcli/util/clilsa.c
@@ -29,6 +29,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
+#include "libcli/security/proto.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 
 struct smblsa_state {

diff --git a/source4/include/nt_status.h b/source4/libcli/util/nt_status.h
similarity index 100%
rename from source4/include/nt_status.h
rename to source4/libcli/util/nt_status.h

diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index ba7203c33aa74cd52b11432ddb8aff031f7b3a0b..3fb142ea0b3795bbf831d0d8285e9bfe8c328143 100644 (file)
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/source4/libcli/wrepl/winsrepl.c
@@ -27,6 +27,8 @@
 #include "libcli/wrepl/winsrepl.h"
 #include "lib/stream/packet.h"
 #include "libcli/composite/composite.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 static struct wrepl_request *wrepl_request_finished(struct wrepl_request *req, NTSTATUS status);
 

diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 5d1ba294c6d09b02dacc3d707c1eadc01f90a770..d5d5863f31db3f30785ff6abd9e1346e511ccf91 100644 (file)
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -27,6 +27,8 @@
 #include "lib/ldb/include/ldb_errors.h"
 #include "passdb/secrets.h"
 #include "dsdb/samdb/samdb.h"
+#include "db_wrap.h"
+#include "libcli/security/proto.h"
 
 /*
  * complete a domain join, when joining to a AD domain:

diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c
index 89974203f2af0da83d8f259d20a3b33333e6a6f1..968b76763ad0544cd58b5abbd0d2298485be0343 100644 (file)
--- a/source4/libnet/libnet_lookup.c
+++ b/source4/libnet/libnet_lookup.c
@@ -28,6 +28,7 @@
 #include "libcli/composite/composite.h"
 #include "lib/messaging/messaging.h"
 #include "lib/messaging/irpc.h"
+#include "libcli/resolve/resolve.h"
 
 struct lookup_state {
        struct composite_context *resolve_ctx;

diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index fe5239f4b666b63351f16b3c9a5425662d38d665..3ccba754ea8e4733f2ea5821a6de01b37a1475cf 100644 (file)
--- a/source4/libnet/libnet_passwd.c
+++ b/source4/libnet/libnet_passwd.c
@@ -23,6 +23,7 @@
 #include "smb.h"
 #include "libnet/libnet.h"
 #include "lib/crypto/crypto.h"
+#include "libcli/auth/proto.h"
 
 /*
  * do a password change using DCERPC/SAMR calls

diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index 4bedbbf119fa28d3eed557ae0025e939e2ef2671..8cc0cada83986244af2144efb490cdb1a85ebd10 100644 (file)
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -29,6 +29,8 @@
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "db_wrap.h"
+#include "libcli/security/proto.h"
 
 struct samsync_ldb_secret {
        struct samsync_ldb_secret *prev, *next;

diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index c76f8f7cde0180e77d71d63f92b76d392858d869..b425926e996cea5b63dec76878d4d8a52a8b511d 100644 (file)
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "auth/gensec/schannel_proto.h"
+#include "libcli/auth/proto.h"
 
 
 /**

diff --git a/source4/libnet/userinfo.c b/source4/libnet/userinfo.c
index c55eae4a374e54894c638d723e40c992c851cea9..8f473b862bd98b002bb6d6e0b25eccf4591fdb2a 100644 (file)
--- a/source4/libnet/userinfo.c
+++ b/source4/libnet/userinfo.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
+#include "libcli/security/proto.h"
 #include "libnet/composite.h"
 #include "libnet/userinfo.h"
 

diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index df70580db3f684c3d2ac809d1b7818c613c3447a..7f44feb0d95c222a0032e6c929e77c3f47472364 100644 (file)
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -24,8 +24,6 @@
 #ifndef __DCERPC_H__
 #define __DCERPC_H__
 
-#include <nt_status.h>
-
 enum dcerpc_transport_t {
        NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC, NCACN_VNS_SPP, 
        NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM, NCADG_UNIX_DGRAM,

diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c
index 64cf6748e8419fe720a6db4494ba8e618bebe048..01b6d099aa44425cc4da525700b6fda0ec7cc8a5 100644 (file)
--- a/source4/librpc/rpc/dcerpc_schannel.c
+++ b/source4/librpc/rpc/dcerpc_schannel.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "auth/auth.h"
+#include "libcli/auth/proto.h"
 
 /*
   get a schannel key using a netlogon challenge on a secondary pipe

diff --git a/source4/main.mk b/source4/main.mk
index 1920e047a8f62a247c96ea4c9423018c49306de0..141278ad6b3e19e065e0a8d374e05bb5138fc3ec 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -248,7 +248,7 @@ include/includes.h: \
                libcli/nbt/libnbt.h \
                lib/util/util_proto.h \
                lib/charset/charset.h \
-               param/param.h
+               param/param.h \
 
 clean_pch: 
        -rm -f include/includes.h.gch

diff --git a/source4/nbt_server/config.mk b/source4/nbt_server/config.mk
index 94c3e9efce193e3c860efb6caf8bc0a77ec707bb..36fec2d87cef7ef001231a4fc775d6a48a50af59 100644 (file)
--- a/source4/nbt_server/config.mk
+++ b/source4/nbt_server/config.mk
@@ -40,6 +40,7 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 # Start SUBSYSTEM NBTD_DGRAM
 [SUBSYSTEM::NBTD_DGRAM]
+PRIVATE_PROTO_HEADER = dgram/proto.h
 OBJ_FILES = \
                dgram/request.o \
                dgram/netlogon.o \

diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index 2c8ef5e7726c404aa4b6e3f5fbe0bd48abd4e90e..eea36060dd4097b46ce2b7c9670811141217ffae 100644 (file)
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -26,6 +26,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
+#include "db_wrap.h"
 
 /*
   reply to a GETDC request

diff --git a/source4/nbt_server/dgram/request.c b/source4/nbt_server/dgram/request.c
index 8dcd53b9b1d63a909f06edc9322faecec920e17d..f28170c1065323a4cd3da9e8299c6d4fcceb9815 100644 (file)
--- a/source4/nbt_server/dgram/request.c
+++ b/source4/nbt_server/dgram/request.c
@@ -24,6 +24,8 @@
 #include "nbt_server/nbt_server.h"
 #include "smbd/service_task.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
+#include "nbt_server/dgram/proto.h"
 
 /*
   a list of mailslots that we have static handlers for

diff --git a/source4/nbt_server/interfaces.c b/source4/nbt_server/interfaces.c
index 36a65b18593acd6f82c56f08b7160ee1ebcfa768..e51cd5c6f350242bb1f5f4e2c24eeb16864d4139 100644 (file)
--- a/source4/nbt_server/interfaces.c
+++ b/source4/nbt_server/interfaces.c
@@ -26,6 +26,9 @@
 #include "smbd/service_task.h"
 #include "lib/socket/socket.h"
 #include "nbt_server/wins/winsserver.h"
+#include "nbt_server/dgram/proto.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 
 /*

diff --git a/source4/nbt_server/irpc.c b/source4/nbt_server/irpc.c
index 8b9c4cfcaac274e69fdd6ee9126e6171e64c28d3..40ea2e5ef378fabafd1aa118f8bbffb9727b702a 100644 (file)
--- a/source4/nbt_server/irpc.c
+++ b/source4/nbt_server/irpc.c
@@ -26,6 +26,7 @@
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
 
 /*
   serve out the nbt statistics

diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c
index ceeb565ffbe9309da6128b0de516f327795c77ec..0d4940d459d42598a138c6dc7b0e0c3b59e6c0b1 100644 (file)
--- a/source4/nbt_server/nbt_server.c
+++ b/source4/nbt_server/nbt_server.c
@@ -24,6 +24,8 @@
 #include "smbd/service_task.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   startup the nbtd task

diff --git a/source4/nbt_server/wins/wins_dns_proxy.c b/source4/nbt_server/wins/wins_dns_proxy.c
index 540f4e2c38036d57871140cf7c4eadacb8075143..da8b2195d33309dd12abe7d113dc03ac2d188a85 100644 (file)
--- a/source4/nbt_server/wins/wins_dns_proxy.c
+++ b/source4/nbt_server/wins/wins_dns_proxy.c
@@ -27,6 +27,7 @@
 #include "system/time.h"
 #include "libcli/composite/composite.h"
 #include "smbd/service_task.h"
+#include "libcli/resolve/resolve.h"
 
 struct wins_dns_proxy_state {
        struct nbt_name_socket *nbtsock;

diff --git a/source4/nbt_server/wins/wins_ldb.c b/source4/nbt_server/wins/wins_ldb.c
index 5efe6bd3abd339e71d8803f1fa505405599c1faf..83b8d3f438c0c1c2b7ae9fdcd74929b0e75c1a4f 100644 (file)
--- a/source4/nbt_server/wins/wins_ldb.c
+++ b/source4/nbt_server/wins/wins_ldb.c
@@ -34,6 +34,8 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "lib/ldb/include/ldb_private.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /* add_record: do things with the sambaPassword attribute */
 static int wins_ldb_verify(struct ldb_module *module, struct ldb_request *req, const struct ldb_message *msg)

diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c
index 60c2ab0e4fed2d8b273770867df049cbdce05e36..7e726aedf2767534b6a7b3544acfbf81600ecce8 100644 (file)
--- a/source4/nbt_server/wins/winsdb.c
+++ b/source4/nbt_server/wins/winsdb.c
@@ -27,6 +27,9 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "system/time.h"
+#include "db_wrap.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 uint64_t winsdb_get_maxVersion(struct winsdb_handle *h)
 {

diff --git a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
index 8135625734c2c8a938caa92e381d61c3e35c2852..c9b6a700aa86cf8998bbafbf514e3d9616e0d5cd 100644 (file)
--- a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
+++ b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
@@ -34,6 +34,8 @@
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
+#include "db_wrap.h"
+#include "rpc_server/common/common.h"
 
 /*
   connect to the SPOOLSS database

diff --git a/source4/ntvfs/common/sidmap.c b/source4/ntvfs/common/sidmap.c
index e96d65e13857028d87096ac254336ff289732b7f..70f7dea95582397216a227d1b87ecdf0cb9d4498 100644 (file)
--- a/source4/ntvfs/common/sidmap.c
+++ b/source4/ntvfs/common/sidmap.c
@@ -26,6 +26,8 @@
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "libcli/ldap/ldap.h"
+#include "db_wrap.h"
+#include "libcli/security/proto.h"
 
 /*
   these are used for the fallback local uid/gid to sid mapping

diff --git a/source4/ntvfs/ipc/rap_server.c b/source4/ntvfs/ipc/rap_server.c
index b68f806ba16da07490b3d8260c088a2147c7a389..9fa831dd4f103a7d8222fc8bde0e3433dfd4cd1f 100644 (file)
--- a/source4/ntvfs/ipc/rap_server.c
+++ b/source4/ntvfs/ipc/rap_server.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "libcli/rap/rap.h"
 #include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "rpc_server/common/common.h"
 
 /* At this moment these are just dummy functions, but you might get the
  * idea. */

diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index 33756bc8bc0d7283544b9a7439e54011e739cd36..a5cd919ba399384a1a34a5ca1ed76554210efee8 100644 (file)
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/ntvfs/posix/pvfs_acl.c
@@ -24,6 +24,7 @@
 #include "auth/auth.h"
 #include "vfs_posix.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
+#include "libcli/security/proto.h"
 
 
 /*

diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index 3b52ff62378ee3a825d3fe6374adbb29635a3bd9..e600be446a0c2dc1ed413a1db11fa8fcdd5fa6fb 100644 (file)
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -29,6 +29,8 @@
 #include "librpc/gen_ndr/ndr_security.h"
 #include "smbd/service_stream.h"
 #include "lib/tdb/include/tdb.h"
+#include "db_wrap.h"
+#include "libcli/security/proto.h"
 
 
 /*

diff --git a/source4/rpc_server/common/common.h b/source4/rpc_server/common/common.h
index a43ca74530c2a984d004254be5dd0f29b39b360e..d0807d849d146e1a1d8558d75468ebad9cbb0c25 100644 (file)
--- a/source4/rpc_server/common/common.h
+++ b/source4/rpc_server/common/common.h
@@ -65,3 +65,5 @@
 
 #define DCESRV_PULL_HANDLE(h, inhandle, t) DCESRV_PULL_HANDLE_RETVAL(h, inhandle, t, NT_STATUS_INVALID_HANDLE)
 #define DCESRV_PULL_HANDLE_WERR(h, inhandle, t) DCESRV_PULL_HANDLE_RETVAL(h, inhandle, t, WERR_BADFID)
+
+#include "rpc_server/common/proto.h"

diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index 13b5a4d1f5f672102b81372aab38fa8e69e4df5d..ced4701e0998412b6067b0a1976555ae7902d9e4 100644 (file)
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -3,6 +3,7 @@
 ################################################
 # Start SUBSYSTEM DCERPC_COMMON
 [SUBSYSTEM::DCERPC_COMMON]
+PRIVATE_PROTO_HEADER = common/proto.h
 OBJ_FILES = \
                common/server_info.o \
                common/share_info.o

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 74f8dfe8d513911410d95f73bfa7502f56a737b3..3e92ce0ef35f8626a047a5744e4f46682a46667f 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -29,6 +29,7 @@
 #include "lib/events/events.h"
 #include "smbd/service_stream.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 540332299dce3b5147e39748b8feb1cae9b4cf61..d696b75b208a3c40832dc02acda852a122685cfe 100644 (file)
--- a/source4/rpc_server/dcerpc_sock.c
+++ b/source4/rpc_server/dcerpc_sock.c
@@ -28,6 +28,8 @@
 #include "rpc_server/dcerpc_server.h"
 #include "smbd/service_stream.h"
 #include "lib/messaging/irpc.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 struct dcesrv_socket_context {
        const struct dcesrv_endpoint *endpoint;

diff --git a/source4/rpc_server/dssetup/dcesrv_dssetup.c b/source4/rpc_server/dssetup/dcesrv_dssetup.c
index 61e560299cbc6118e72e301dee9df7eb54bfe339..9bd8be322350d027d8b984cd348810389baefb5e 100644 (file)
--- a/source4/rpc_server/dssetup/dcesrv_dssetup.c
+++ b/source4/rpc_server/dssetup/dcesrv_dssetup.c
@@ -27,6 +27,7 @@
 #include "rpc_server/common/common.h"
 #include "ldb/include/ldb.h"
 #include "dsdb/samdb/samdb.h"
+#include "db_wrap.h"
 /* 
   dssetup_DsRoleGetPrimaryDomainInformation 
 */

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index b62e1abaefc19b92756f7a814d34ff972a23821b..5af1dc3f4092f921e9715ca3ae092385d11fc937 100644 (file)
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -27,7 +27,10 @@
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/ldap/ldap.h"
+#include "libcli/security/proto.h"
+#include "libcli/auth/proto.h"
 #include "ntvfs/ntvfs.h"
+#include "db_wrap.h"
 
 /*
   this type allows us to distinguish handle types

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 1b13548c6bc84f3d268e038974b64794538c9dd5..76968882490fda780e847d07c5967789bb3e5a7b 100644 (file)
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -28,6 +28,8 @@
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
 #include "rpc_server/samr/proto.h"
+#include "db_wrap.h"
+#include "libcli/auth/proto.h"
 
 struct server_pipe_state {
        struct netr_Credential client_challenge;

diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index e8828a912f89a4f393ba5812dc9e23c5e05be814..156cf931fe943c5bd848b55117539514b4144ab7 100644 (file)
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -32,7 +32,9 @@
 #include "ads.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/ldap/ldap.h"
+#include "libcli/security/proto.h"
 #include "rpc_server/samr/proto.h"
+#include "db_wrap.h"
 
 
 /*

diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index 998005cb0e576eae9c891936a92b275253fc9190..00d2f589ae375362ee40b99bc29516b55ab07319 100644 (file)
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -32,6 +32,8 @@
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "rpc_server/samr/proto.h"
+#include "libcli/auth/proto.h"
+#include "db_wrap.h"
 
 /* 
   samr_ChangePasswordUser 

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index c3365388d2319ff6eec413beee78866ca1dd3743..6efa1119498ceb2ea1b92c1fa393d504e80b8988 100644 (file)
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -10,6 +10,7 @@ NOPROTO = YES
 #######################
 # Start LIBRARY SMBCALLS
 [SUBSYSTEM::SMBCALLS]
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
                smbcalls.o \
                smbcalls_config.o \

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index c84f9eb6fb3f92e61f5f9fb8d56529c0e19f3021..3fb2ac0903d40c5fdb0150ae454d7cc65d7599fc 100644 (file)
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -27,6 +27,7 @@
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_winreg.h"
 #include "scripting/ejs/ejsrpc.h"
+#include "libcli/security/proto.h"
 
 /*
   set the switch var to be used by the next union switch

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index d8c44c2450de31d33aa108c6eac9ff1bcbfcc261..419cb4869e3f80332c562e2837f0b82d76b76fe1 100644 (file)
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/ldb/include/ldb.h"
+#include "scripting/ejs/smbcalls.h"
 
 /*
   return a default mpr object

diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index 927c3ccf2f7cfbfcfe9fcc9b92a2fa05c24dec37..f47d27643d48c4b7ee23efe3c8523c4cc761f1fd 100644 (file)
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -28,3 +28,5 @@ NTSTATUS mprGetVar(struct MprVar **v, const char *name);
 void mprAddArray(struct MprVar *var, int i, struct MprVar v);
 void mprSetCFunction(struct MprVar *obj, const char *name, MprCFunction fn);
 void mprSetStringCFunction(struct MprVar *obj, const char *name, MprStringCFunction fn);
+
+#include "scripting/ejs/proto.h"

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index b0b1420ba2c32b1e0ac0df762733e8efd2eda857..949dd0321af3fa21ef2736158848c5d6c3524e6a 100644 (file)
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -24,6 +24,8 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "param/loadparm.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   return a list of defined services

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 1a224605eecb0283cff143ad65955125e0252afa..9ba7668a38d8f2af2b1d9ce2aaca69c27f7c8448 100644 (file)
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -27,6 +27,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "lib/cmdline/popt_common.h"
+#include "db_wrap.h"
 
 /*
   get the connected db

diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index f72b4b46ac2dfb2f3887e323d29da1b977625ea9..dcefd56a0c3441c3c9bfe436d8ecd6b0fa004fce 100644 (file)
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -25,6 +25,7 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "lib/events/events.h"
+#include "libcli/resolve/resolve.h"
 
 /*
   look up a netbios name

diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 1a876c9e875d4b24b2b9b44536f57963f1a6f931..b8382db296a9d9fcd3f53cdedc6f5956383cfb8f 100644 (file)
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -25,6 +25,8 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/ldb/include/ldb.h"
 #include "system/time.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   return the list of configured network interfaces

diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index 6e517cd3869e1ace18cd6188c4cea848a40b49b9..469f9372192813793474369d269c4e82af86d5a1 100644 (file)
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -26,6 +26,8 @@
 #include "lib/stream/packet.h"
 #include "libcli/smb2/smb2.h"
 #include "smb_server/smb2/smb2_server.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob)
 {

diff --git a/source4/smbd/process_model.h b/source4/smbd/process_model.h
index 2575adeccba1e3e437538034c6e9c560c1276c9a..4080d2d4b6e47da76a296ff759d9701965a172b1 100644 (file)
--- a/source4/smbd/process_model.h
+++ b/source4/smbd/process_model.h
@@ -61,3 +61,5 @@ struct process_model_critical_sizes {
        int interface_version;
        int sizeof_model_ops;
 };
+
+#include "smbd/process_model_proto.h"

diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk
index b8f960215afd268e5ebceee8acd8e8559db62f8d..22083a7a870d36a17f9b88c563bb518ef604af20 100644 (file)
--- a/source4/smbd/process_model.mk
+++ b/source4/smbd/process_model.mk
@@ -34,6 +34,7 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_PTHREAD
 ################################################
 # Start SUBSYSTEM PROCESS_MODEL
 [SUBSYSTEM::PROCESS_MODEL]
+PRIVATE_PROTO_HEADER = process_model_proto.h
 OBJ_FILES = \
                process_model.o
 #

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

diff --git a/source4/smbd/service.c b/source4/smbd/service.c
index 2057fc811a6d7942b48df338dd142fc1cef3ff37..5bced4eae45335b3dc0b9ec1521d3e291e077cad 100644 (file)
--- a/source4/smbd/service.c
+++ b/source4/smbd/service.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "smbd/process_model.h"
 
 /*
   a linked list of registered servers

diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index 2554295af9dc3bd166647f7bb76489dbde143178..2e180bfa2948f72d0e8965159763410ad7bf2054 100644 (file)
--- a/source4/torture/auth/pac.c
+++ b/source4/torture/auth/pac.c
@@ -27,6 +27,7 @@
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "samba3/samba3.h"
+#include "libcli/security/proto.h"
 
 static BOOL torture_pac_self_check(void) 
 {

diff --git a/source4/torture/ldap/cldapbench.c b/source4/torture/ldap/cldapbench.c
index 806bf9b558cd8996e3de4d1546671e3f34cc62a4..8d541325e8f748f2f1727b5718382f3e2774fd68 100644 (file)
--- a/source4/torture/ldap/cldapbench.c
+++ b/source4/torture/ldap/cldapbench.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "libcli/cldap/cldap.h"
+#include "libcli/resolve/resolve.h"
 
 struct bench_state {
        int pass_count, fail_count;

diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index 744059760ec2c7b6743c321cf1ea6868d07fe06e..589b2ee288cd37954d0d9943c65f64d89cfec59e 100644 (file)
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -23,6 +23,7 @@
 #include "torture/torture.h"
 #include "libnet/libnet.h"
 #include "libnet/userinfo.h"
+#include "libcli/security/proto.h"
 
 #define TEST_USERNAME  "libnetuserinfotest"
 

diff --git a/source4/torture/local/resolve.c b/source4/torture/local/resolve.c
index f86b4b726b33066323e97847609bb14d819929f0..a52bfeeb48fb504f0afdfaf1fed21e1ab23584bb 100644 (file)
--- a/source4/torture/local/resolve.c
+++ b/source4/torture/local/resolve.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
+#include "libcli/resolve/resolve.h"
 
 static BOOL test_async_resolve(TALLOC_CTX *mem_ctx)
 {

diff --git a/source4/torture/local/sddl.c b/source4/torture/local/sddl.c
index 30ce424741280fefa8b704c21ec14fc1dbfed8c7..8d940093d1f6e2815faefc3872bd520643c902ec 100644 (file)
--- a/source4/torture/local/sddl.c
+++ b/source4/torture/local/sddl.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/security/proto.h"
 
 
 /*

diff --git a/source4/torture/local/socket.c b/source4/torture/local/socket.c
index 195354611f45ac2dc6cd3518557df8d9210341c9..66268f4f8018cb40a815688aca77f087a1e3f0de 100644 (file)
--- a/source4/torture/local/socket.c
+++ b/source4/torture/local/socket.c
@@ -23,6 +23,8 @@
 #include "includes.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \

diff --git a/source4/torture/nbt/browse.c b/source4/torture/nbt/browse.c
index a231809ef0c89b0c3e52b4c0e1f2b396b5687fb2..1b2b698a23779b2a3fc58ea4db5f7deebc8ef31b 100644 (file)
--- a/source4/torture/nbt/browse.c
+++ b/source4/torture/nbt/browse.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "libcli/resolve/resolve.h"
 
 /*
   test nbt dgram operations

diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index db074ebeba20806b3282067c0de507c8b087aae5..7e0058cd9f1505cfaf083065176b178bc2063f17 100644 (file)
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -26,6 +26,9 @@
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 #include "torture/rpc/proto.h"
+#include "libcli/resolve/resolve.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 #define TEST_NAME "TORTURE_TEST"
 

diff --git a/source4/torture/nbt/query.c b/source4/torture/nbt/query.c
index fbb4224b2843eecd01507cd9036f9a500e3c023a..e9c302d89ce67b867d81b25764189d9716b64cd2 100644 (file)
--- a/source4/torture/nbt/query.c
+++ b/source4/torture/nbt/query.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
+#include "libcli/resolve/resolve.h"
 
 struct result_struct {
        int num_pass;

diff --git a/source4/torture/nbt/register.c b/source4/torture/nbt/register.c
index cd7d3c762477b2619841225229bf1c369524ff7e..9b928fefcf6f4dc35caa1db6e44058f001f48a08 100644 (file)
--- a/source4/torture/nbt/register.c
+++ b/source4/torture/nbt/register.c
@@ -22,6 +22,9 @@
 
 #include "includes.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 #define CHECK_VALUE(v, correct) do { \
        if ((v) != (correct)) { \

diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c
index bcb52dc9b81b0e72b876c2bd747883d14e42ac53..fe2ffeb36ea1728b74af9c88ac6803da57fec52b 100644 (file)
--- a/source4/torture/nbt/wins.c
+++ b/source4/torture/nbt/wins.c
@@ -22,6 +22,9 @@
 
 #include "includes.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 #define CHECK_VALUE(v, correct) do { \
        if ((v) != (correct)) { \

diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c
index 5aa97f9ade93139e52e02d258119322ac2fcd23d..e629b842e78cf434b6d651845ddce2d685e54e9e 100644 (file)
--- a/source4/torture/nbt/winsbench.c
+++ b/source4/torture/nbt/winsbench.c
@@ -23,6 +23,9 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 struct wins_state {
        int num_names;

diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index b53c55ca08c211973d983f0cb7b1d48258ce2031..25056f7b9c3c99bdc745167875ab894cad856ee4 100644 (file)
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -25,6 +25,9 @@
 #include "libcli/wrepl/winsrepl.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \

diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index 6450acab18a84a80f18c1c69511df3abe18b9082..470477165f3a78e369986e1cdd04fefbe87d698e 100644 (file)
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
+#include "libcli/security/proto.h"
 
 #define BASEDIR "\\testsd"
 

diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 6025c3d1e4b5db4f6324bc4c8ff7f6d0eef5e159..97c47acc7e379ffbe22439090f29f9a4824fc512 100644 (file)
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -25,6 +25,7 @@
 #include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
+#include "libcli/security/proto.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"

diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 5d7ddc6c80fdf7c655892c0186645db7aae1c9e5..9b62faee8e49fc2a80d1e3f263414fbc50907505 100644 (file)
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -24,6 +24,8 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "lib/events/events.h"
+#include "libcli/security/proto.h"
+#include "libcli/auth/proto.h"
 
 static void init_lsa_String(struct lsa_String *name, const char *s)
 {

diff --git a/source4/torture/rpc/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c
index 4bfe33baa16f1d1f74cf141f02090b1c3f71574e..aa36c63f29fd396a538ae380a2a9621f2b27a035 100644 (file)
--- a/source4/torture/rpc/lsa_lookup.c
+++ b/source4/torture/rpc/lsa_lookup.c
@@ -23,6 +23,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "lib/events/events.h"
+#include "libcli/security/proto.h"
 
 static BOOL open_policy(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *p,
                        struct policy_handle **handle)

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 79e85cce578e1fb3dda8b6aedc1874f64c1e0b3b..e786dd38982e973011b35fe9690d89fd36903d94 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -29,6 +29,7 @@
 #include "smb.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/rpc/proto.h"
+#include "libcli/auth/proto.h"
 
 static const char *machine_password;
 

diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index 185a2a6870dd97b54e633219d92395de90e2463d..9965e5ddbd7a5c09e58278a27837bc6bab3f8c83 100644 (file)
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -29,6 +29,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "torture/rpc/proto.h"
 #include "auth/gensec/schannel_proto.h"
+#include "libcli/auth/proto.h"
 
 #define TEST_MACHINE_NAME "samlogontest"
 #define TEST_USER_NAME "samlogontestuser"

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 3950942b546d5dbaabc2351a14d4828182fa0b56..6d1b507c2b61a506857415161ac0067bfe49e85a 100644 (file)
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -26,6 +26,8 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "smb.h"
 #include "lib/crypto/crypto.h"
+#include "libcli/auth/proto.h"
+#include "libcli/security/proto.h"
 
 #define TEST_ACCOUNT_NAME "samrtorturetest"
 #define TEST_ALIASNAME "samrtorturetestalias"

diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 68a5a4a2b67ada1d311befefd0c7564c620b1c38..6155b7ac1e011a1bf39384bdfd5d601137543bcd 100644 (file)
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -30,6 +30,8 @@
 #include "system/time.h"
 #include "torture/rpc/proto.h"
 #include "auth/gensec/schannel_proto.h"
+#include "libcli/auth/proto.h"
+#include "libcli/security/proto.h"
 
 #define TEST_MACHINE_NAME "samsynctest"
 #define TEST_WKSTA_MACHINE_NAME "samsynctest2"

diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index ee16d2de75f1700ab0d7f2176ea0ca73ae867cd7..b5ff8bbfac60c91952ffdefeb97ac5fd20fbec95 100644 (file)
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -25,6 +25,8 @@
 #include "torture/rpc/proto.h"
 #include "lib/cmdline/popt_common.h"
 #include "auth/gensec/schannel_proto.h"
+#include "libcli/auth/proto.h"
+#include "libcli/security/proto.h"
 
 #define TEST_MACHINE_NAME "schannel"
 

diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c
index 26626c908ee6847550006e6a5cb4a36be514d031..b5f8889ded229dd924e5754d56b66f287e46b7b3 100644 (file)
--- a/source4/torture/rpc/session_key.c
+++ b/source4/torture/rpc/session_key.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_lsa.h"
 
 #include "torture/rpc/proto.h"
+#include "libcli/auth/proto.h"
 
 static void init_lsa_String(struct lsa_String *name, const char *s)
 {

diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 7a02ba24ca1cfdff52f1792aa07226dcfe904bb4..9f39224b68d4cdc5819caac1a5eec409b4cb10b1 100644 (file)
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -35,6 +35,8 @@
 #include "lib/ldb/include/ldb.h"
 
 #include "torture/rpc/proto.h"
+#include "libcli/security/proto.h"
+#include "libcli/auth/proto.h"
 
 struct test_join {
        struct dcerpc_pipe *p;

diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 2710215e602fbb35cbe6b2e0c92b032fd78e0811..293cba0ee1d397aa1de8722f2e51022ae2e57d11 100644 (file)
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_winreg.h"
+#include "libcli/security/proto.h"
 
 #define TEST_KEY_BASE "smbtorture test"
 #define TEST_KEY1 TEST_KEY_BASE "\\spottyfoot"

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 067af257fab071a6f626f30dfd2f2f6ddc024149..2ce51407beb80d4136461c3273a17758b2a63090 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -29,6 +29,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "lib/events/events.h"
+#include "libcli/resolve/resolve.h"
 
 #include "torture/basic/proto.h"
 #include "torture/raw/proto.h"

diff --git a/source4/utils/nmblookup.c b/source4/utils/nmblookup.c
index f7ec40d1371cdd5083226d92fb03164109ad90bf..938fb02966c5e7db3e1a2eec9ab6d6d8f9dd18b9 100644 (file)
--- a/source4/utils/nmblookup.c
+++ b/source4/utils/nmblookup.c
@@ -26,6 +26,8 @@
 #include "lib/cmdline/popt_common.h"
 #include "system/iconv.h"
 #include "lib/socket/socket.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /* command line options */
 static struct {

diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c
index d6b65d75d7d0d633cbc6b56026d2001b698c76be..be5739eade02dc01406bed80fd4d6e916b03914b 100644 (file)
--- a/source4/utils/ntlm_auth.c
+++ b/source4/utils/ntlm_auth.c
@@ -27,6 +27,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "auth/auth.h"
 #include "pstring.h"
+#include "libcli/auth/proto.h"
 
 #define SQUID_BUFFER_SIZE 2010
 

diff --git a/source4/web_server/http.c b/source4/web_server/http.c
index b2b75c8148289067aece1f9428e7a50816751c4d..c90780a249c83ebc65416e514fb18d9032d54ec2 100644 (file)
--- a/source4/web_server/http.c
+++ b/source4/web_server/http.c
@@ -30,6 +30,7 @@
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "dlinklist.h"
 #include "lib/tls/tls.h"
+#include "scripting/ejs/smbcalls.h"
 
 #define SWAT_SESSION_KEY "SwatSessionId"
 #define HTTP_PREAUTH_URI "/scripting/preauth.esp"

diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index 57bb5c62b177891ea7118f984784fa0f75d3799e..e1d418a68285a4180a3e5a6204a86a2b6f112c85 100644 (file)
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -26,6 +26,8 @@
 #include "web_server/web_server.h"
 #include "lib/events/events.h"
 #include "system/filesys.h"
+#include "system/network.h"
+#include "netif/netif.h"
 #include "lib/tls/tls.h"
 
 /* don't allow connections to hang around forever */

diff --git a/source4/winbind/config.mk b/source4/winbind/config.mk
index 1a91f7bee5c0b4f10099047e2ce7c5bee725be52..342007377d3265fa5b64b675f35b39431a38d709 100644 (file)
--- a/source4/winbind/config.mk
+++ b/source4/winbind/config.mk
@@ -28,6 +28,7 @@ REQUIRED_SUBSYSTEMS = WB_HELPER RPC_NDR_LSA RPC_NDR_SAMR
 ################################################
 # Start SUBYSTEM WB_HELPER
 [SUBSYSTEM::WB_HELPER]
+PRIVATE_PROTO_HEADER = wb_helper.h
 OBJ_FILES = \
                wb_async_helpers.o
 REQUIRED_SUBSYSTEMS = RPC_NDR_LSA RPC_NDR_SAMR

diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c
index f4de7d42845e0a81ee78cc4f286498f37b613623..fbffebc0920920944ebccba84f53a5e30d3ff542 100644 (file)
--- a/source4/winbind/wb_async_helpers.c
+++ b/source4/winbind/wb_async_helpers.c
@@ -28,6 +28,10 @@
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
 #include "libcli/auth/credentials.h"
+#include "libcli/security/proto.h"
+#include "libcli/auth/proto.h"
+
+#include "winbind/wb_helper.h"
 
 struct get_schannel_creds_state {
        struct cli_credentials *wks_creds;

diff --git a/source4/winbind/wb_cmd_lookupname.c b/source4/winbind/wb_cmd_lookupname.c
index 3d894c006489c71d7214efc2838466afe58ff57f..51d5c5a8d8b12e7dfe8f02924bb6c4a33e3bc9d1 100644 (file)
--- a/source4/winbind/wb_cmd_lookupname.c
+++ b/source4/winbind/wb_cmd_lookupname.c
@@ -23,6 +23,8 @@
 #include "includes.h"
 #include "libcli/composite/composite.h"
 #include "winbind/wb_server.h"
+#include "winbind/wb_async_helpers.h"
+#include "winbind/wb_helper.h"
 #include "smbd/service_task.h"
 
 struct cmd_lookupname_state {

diff --git a/source4/winbind/wb_cmd_lookupsid.c b/source4/winbind/wb_cmd_lookupsid.c
index 4733702583b781cbd522add25d82590915a8b276..fbc01d60b816269f6bfdd164f61da72dae2c072a 100644 (file)
--- a/source4/winbind/wb_cmd_lookupsid.c
+++ b/source4/winbind/wb_cmd_lookupsid.c
@@ -23,7 +23,9 @@
 #include "includes.h"
 #include "libcli/composite/composite.h"
 #include "winbind/wb_server.h"
+#include "winbind/wb_helper.h"
 #include "smbd/service_task.h"
+#include "libcli/security/proto.h"
 
 struct cmd_lookupsid_state {
        struct composite_context *ctx;

diff --git a/source4/winbind/wb_cmd_userdomgroups.c b/source4/winbind/wb_cmd_userdomgroups.c
index a0ac939a1e933d4fa3d34354c7609cdc323cd0f1..b118f9c9c5af7a4a4daae7eeb20a47f45d5eeda1 100644 (file)
--- a/source4/winbind/wb_cmd_userdomgroups.c
+++ b/source4/winbind/wb_cmd_userdomgroups.c
@@ -22,7 +22,9 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
+#include "libcli/security/proto.h"
 #include "winbind/wb_server.h"
+#include "winbind/wb_helper.h"
 #include "smbd/service_task.h"
 
 struct cmd_userdomgroups_state {

diff --git a/source4/winbind/wb_cmd_usersids.c b/source4/winbind/wb_cmd_usersids.c
index 4c107824fbeced29aef75e7525ef6679f68bb4e9..4e2195d88367dc18be15d6733093da39f45ab472 100644 (file)
--- a/source4/winbind/wb_cmd_usersids.c
+++ b/source4/winbind/wb_cmd_usersids.c
@@ -25,6 +25,7 @@
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "libcli/security/proto.h"
 
 /* Calculate the token in two steps: Go the user's originating domain, ask for
  * the user's domain groups. Then with the resulting list of sids go to our

diff --git a/source4/winbind/wb_connect_sam.c b/source4/winbind/wb_connect_sam.c
index 1817785508c9f7bf244501d0c0617538c9de710f..2c26ffe29abc00f7ef4adbea3c0d739ca41786a4 100644 (file)
--- a/source4/winbind/wb_connect_sam.c
+++ b/source4/winbind/wb_connect_sam.c
@@ -25,6 +25,7 @@
 #include "libcli/composite/composite.h"
 
 #include "libcli/raw/libcliraw.h"
+#include "libcli/security/proto.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 
 

diff --git a/source4/winbind/wb_dom_info.c b/source4/winbind/wb_dom_info.c
index 1b327883389072b4dc453a416edf66bbb7a4415c..185457bcbf58acafe9f49cc7e1730984f2204078 100644 (file)
--- a/source4/winbind/wb_dom_info.c
+++ b/source4/winbind/wb_dom_info.c
@@ -23,6 +23,8 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
+#include "libcli/resolve/resolve.h"
+#include "libcli/security/proto.h"
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
 #include "librpc/gen_ndr/ndr_irpc.h"

diff --git a/source4/winbind/wb_dom_info_trusted.c b/source4/winbind/wb_dom_info_trusted.c
index 7c2ff0232c43d147f86f856cb059ada9db56889f..652d646d864c80c588972accfbec05eefc75f4a4 100644 (file)
--- a/source4/winbind/wb_dom_info_trusted.c
+++ b/source4/winbind/wb_dom_info_trusted.c
@@ -22,6 +22,8 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
+#include "libcli/resolve/resolve.h"
+#include "libcli/security/proto.h"
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"

diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c
index b10b5458ba3d7d59056649cfd61120780a442aed..4045ddc2442b27c965c8866e566a7c136e953581 100644 (file)
--- a/source4/winbind/wb_init_domain.c
+++ b/source4/winbind/wb_init_domain.c
@@ -24,9 +24,12 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "winbind/wb_server.h"
+#include "winbind/wb_async_helpers.h"
+#include "winbind/wb_helper.h"
 #include "smbd/service_task.h"
 
 #include "libcli/auth/credentials.h"
+#include "libcli/security/proto.h"
 
 #include "libcli/ldap/ldap_client.h"
 

diff --git a/source4/winbind/wb_pam_auth.c b/source4/winbind/wb_pam_auth.c
index f85cfd1f1aa91123d9a08bb0b79dfef22d53569b..b57f91866924c531c03f357f216b5218f09987fe 100644 (file)
--- a/source4/winbind/wb_pam_auth.c
+++ b/source4/winbind/wb_pam_auth.c
@@ -26,6 +26,7 @@
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
 #include "libcli/auth/credentials.h"
+#include "libcli/auth/proto.h"
 
 /* Oh, there is so much to keep an eye on when authenticating a user.  Oh my! */
 struct pam_auth_crap_state {

diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index fd36dde16dc19b993d7fd49bb332675bb9500f66..39cee9baba342539c0d76c87abf188ee8e81a48b 100644 (file)
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -28,6 +28,7 @@
 #include "libcli/composite/composite.h"
 #include "version.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "libcli/security/proto.h"
 
 /* 
    Send off the reply to an async Samba3 query, handling filling in the PAM, NTSTATUS and string errors.

diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index 9c045585832fd1764f3a0c33f127a6fb2fd87e9f..45684be0f4120118fb3e32d05d4202a793ab4416 100644 (file)
--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@@ -25,6 +25,7 @@
 #include "dlinklist.h"
 #include "lib/events/events.h"
 #include "smbd/service_task.h"
+#include "smbd/process_model.h"
 #include "smbd/service_stream.h"
 #include "nsswitch/winbind_nss_config.h"
 #include "winbind/wb_server.h"

diff --git a/source4/winbind/wb_sid2domain.c b/source4/winbind/wb_sid2domain.c
index 837e491722b45eae01ac01753f156302b34b9759..793445e73b18c01f11551fa359870975c387c41b 100644 (file)
--- a/source4/winbind/wb_sid2domain.c
+++ b/source4/winbind/wb_sid2domain.c
@@ -25,6 +25,7 @@
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
 #include "winbind/wb_async_helpers.h"
+#include "libcli/security/proto.h"
 #include "include/dlinklist.h"
 
 static struct wbsrv_domain *find_domain_from_sid(struct wbsrv_service *service,

diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index 80e443ace763663d7ce0ff60e3147337c600e39c..6e6d2db3208e36ff1bd31758211b4b7c082c30d8 100644 (file)
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -28,6 +28,9 @@
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
+#include "smbd/process_model.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 void wreplsrv_terminate_in_connection(struct wreplsrv_in_connection *wreplconn, const char *reason)
 {

diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index a4dc6e2c74e50ec800d42d7b75cfec9197d93edd..29d3246d6273d1fe0485266eae60482a1fe75a9e 100644 (file)
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -30,6 +30,7 @@
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_errors.h"
 #include "auth/auth.h"
+#include "db_wrap.h"
 
 static struct ldb_context *wins_config_db_connect(TALLOC_CTX *mem_ctx)
 {