r14363: Remove credentials.h from the global includes.

(This used to be commit 98c4c3051391c6f89df5d133665f51bef66b1563)

diff --git a/source4/auth/credentials/credentials.h b/source4/auth/credentials/credentials.h
index eb4e5c96d090c27fc6457246f6a81d4be6fa5145..58d393f762e3f841f07e91508da49a9b7be77fc9 100644 (file)
--- a/source4/auth/credentials/credentials.h
+++ b/source4/auth/credentials/credentials.h
@@ -20,6 +20,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
+#ifndef __CREDENTIALS_H__
+#define __CREDENTIALS_H__
 
 struct ccache_container;
 
@@ -103,3 +105,5 @@ struct cli_credentials {
 };
 
 #include "auth/credentials/credentials_proto.h"
+
+#endif /* __CREDENTIALS_H__ */

diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c
index c4e384c2cd34adfe31f5aebe19282deae0261de5..dd510f97f1baff8e1ab522e0a3c58b836901baac 100644 (file)
--- a/source4/auth/credentials/credentials_files.c
+++ b/source4/auth/credentials/credentials_files.c
@@ -28,6 +28,7 @@
 #include "passdb/secrets.h"
 #include "system/filesys.h"
 #include "db_wrap.h"
+#include "auth/credentials/credentials.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 eafd5e00a2ab7a84561eba060b168c29bde5e7f4..768ed9bb3f930dbb31700c31210b9ec64604f492 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 "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 
 void cli_credentials_get_ntlm_username_domain(struct cli_credentials *cred, TALLOC_CTX *mem_ctx, 

diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h
index 2084ebb97aaa69aeeacfa0740ecf4647dd39facd..1e9c74566cdf6401d58914e518be121f2bc84633 100644 (file)
--- a/source4/auth/gensec/gensec.h
+++ b/source4/auth/gensec/gensec.h
@@ -21,6 +21,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __GENSEC_H__
+#define __GENSEC_H__
+
 #define GENSEC_OID_NTLMSSP "1 3 6 1 4 1 311 2 2 10"
 #define GENSEC_OID_SPNEGO "1 3 6 1 5 5 2"
 #define GENSEC_OID_KERBEROS5 "1 2 840 113554 1 2 2"
@@ -124,4 +127,7 @@ struct gensec_critical_sizes {
        int sizeof_gensec_security;
 };
 
+#include "auth/credentials/credentials.h"
 #include "gensec_proto.h"
+
+#endif /* __GENSEC_H__ */

diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
index 2408291a48377d291ddb599856f9c74168a02306..d8f615562032d8392b80eb6118fa03251e0eff63 100644 (file)
--- a/source4/auth/kerberos/kerberos.h
+++ b/source4/auth/kerberos/kerberos.h
@@ -21,6 +21,7 @@
 
 #if defined(HAVE_KRB5)
 
+#include "auth/credentials/credentials.h"
 #include "auth/kerberos/krb5_init_context.h"
 
 struct ccache_container {
@@ -166,4 +167,3 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx,
 #include "auth/kerberos/proto.h"
 
 #endif /* HAVE_KRB5 */
-

diff --git a/source4/auth/ntlm_check.c b/source4/auth/ntlm_check.c
index 390caa0071aee7e843388243b959023edc3bc096..cea6eeafc13b46df870cd0d8ae24d59c52c264a7 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 "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 
 /****************************************************************************

diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index 53027d33d527f1ecd8374fe635c75f1912cf8518..a4015683d12deb43ff3140edb2849459b6e7f1dd 100644 (file)
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -1,13 +1,11 @@
 - saner names for some of the .pc files
 - .pc files also when there is a public header?
-- get rid of include/structs.h and include/proto.h
- - support including a custom header by librpc/gen_ndr/*.c files
- - if a ndr_.*_man.h file exists, include it.
 - plugin loading support in ldb
 - proper #include dependencies:
   for each subsystem:
   - include line in Makefile
   - rule in Makefile
+- improve include paths and how they are handled
 - install autogenerated headers (seperate directory)
 - subdir handler for install headers into a specific directory
 

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index bdbbafd95531eb6239066e7e3d94eb8293202ad7..6943a5f3563eefe0366957d54aa1136789fe95fa 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 "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 9f9a8c229e54cfaf8b2cb0b35a191363fda5bc8b..e666de1414fd8da9268681d864ccf268937ef441 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -41,6 +41,7 @@
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_private.h"
+#include "auth/credentials/credentials.h"
 
 struct proxy_data {
        struct ldb_context *upstream;

diff --git a/source4/gtk/common/credentials.c b/source4/gtk/common/credentials.c
index 01132ec6bd6cb8353e46ce04c4f6231e9c69eeb1..0646131b73756bb50d2f7838506e3c5654cd07fe 100644 (file)
--- a/source4/gtk/common/credentials.c
+++ b/source4/gtk/common/credentials.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "gtk/common/gtk-smb.h"
+#include "auth/credentials/credentials.h"
 
 static void gtk_get_credentials(struct cli_credentials *credentials)
 {

diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c
index 72ba5f992b2b4dcd8cf3f428febd94d94251f546..fdbf5357ea412a167990f7eddbcf7894d2476acf 100644 (file)
--- a/source4/gtk/tools/gregedit.c
+++ b/source4/gtk/tools/gregedit.c
@@ -23,6 +23,7 @@
 #include "lib/registry/registry.h"
 #include "lib/registry/reg_backend_rpc.h"
 #include "gtk/common/gtk-smb.h"
+#include "auth/credentials/credentials.h"
 
 static GtkTreeStore *store_keys;
 static GtkListStore *store_vals;

diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c
index 020bae30f29bb9c453ebe1d0dbfd6211734d30d7..f2e42d01ddd2c47351488c14eb5ee32f8243cc70 100644 (file)
--- a/source4/gtk/tools/gwcrontab.c
+++ b/source4/gtk/tools/gwcrontab.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_atsvc.h"
 #include "gtk/common/gtk-smb.h"
+#include "auth/credentials/credentials.h"
 
 static struct dcerpc_pipe *at_pipe = NULL;
 static GtkWidget *mainwin;

diff --git a/source4/gtk/tools/gwsam.c b/source4/gtk/tools/gwsam.c
index 55e11471e23f651173e28b89ac3092cecc40df86..633b04851aa39a0d42420021592f2f5106305d7c 100644 (file)
--- a/source4/gtk/tools/gwsam.c
+++ b/source4/gtk/tools/gwsam.c
@@ -23,6 +23,7 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
+#include "auth/credentials/credentials.h"
 
 struct policy_handle sam_handle;
 struct dcerpc_pipe *sam_pipe = NULL;

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 81105d227d3e996d3f0429dfbf56d0caab509f2d..4ff67791f9a58462dc3306f0e8b4a32de48a7868 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -117,11 +117,8 @@ enum brl_type {
 #include "libcli/util/nterr.h"
 #include "libcli/util/doserr.h"
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/dcerpc.h"
 #include "librpc/ndr/ndr_orpc.h"
-#include "librpc/gen_ndr/orpc.h"
 #include "librpc/rpc/dcerpc.h"
-#include "auth/credentials/credentials.h"
 #include "libcli/nbt/libnbt.h"
 #include "libcli/util/proto.h"
 

diff --git a/source4/lib/cmdline/credentials.c b/source4/lib/cmdline/credentials.c
index b19cbf73c0b387e053ab5947b967d41cb7c2800c..b2ec67a72ed531743749b4f66a269a9898ea3b76 100644 (file)
--- a/source4/lib/cmdline/credentials.c
+++ b/source4/lib/cmdline/credentials.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "auth/credentials/credentials.h"
 
 static const char *cmdline_get_userpassword(struct cli_credentials *credentials)
 {

diff --git a/source4/lib/samba3/secrets.c b/source4/lib/samba3/secrets.c
index 33992a9b32a9c5e015e1f7497d832dd880844ae0..02864b601655076737c9edb54dffb3fe5e7915e7 100644 (file)
--- a/source4/lib/samba3/secrets.c
+++ b/source4/lib/samba3/secrets.c
@@ -30,6 +30,7 @@
 #include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "lib/tdb/include/tdbutil.h"
+#include "auth/credentials/credentials.h"
 
 /**
  * Unpack SID into a pointer

diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c
index f267baa4c088e73a8568d86643d136ee8d0c2139..587fb98920bb80b8171d813e6129c6da570b7375 100644 (file)
--- a/source4/libcli/auth/smbencrypt.c
+++ b/source4/libcli/auth/smbencrypt.c
@@ -28,6 +28,7 @@
 #include "auth/ntlmssp/ntlmssp.h"
 #include "auth/ntlmssp/msrpc_parse.h"
 #include "lib/crypto/crypto.h"
+#include "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 #include "pstring.h"
 

diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index 8616e42cd48b0bdc5a551631f2118084d3544a91..a718f43d96e2e57b3f696b97db3e03d83887eea6 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 "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 #include "libcli/smb_composite/smb_composite.h"
 

diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index 07da2d363a2e08adb415ceb42c6f28b361c67d38..b36e37a1a4ff97cbe9669b7c55ab0f1b88bd2efa 100644 (file)
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -27,6 +27,7 @@
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/events/events.h"
 #include "libcli/resolve/resolve.h"
+#include "auth/credentials/credentials.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 9e345ab4f87106328f4d1865de39e2638abd0014..a62386b67212cccf557dc612522d4072f34bb283 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 "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 #include "auth/auth.h"
 #include "version.h"

diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index d5d5863f31db3f30785ff6abd9e1346e511ccf91..914c2bfbb1e284bffb467449efdc3c939a3914ab 100644 (file)
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -29,6 +29,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "db_wrap.h"
 #include "libcli/security/proto.h"
+#include "auth/credentials/credentials.h"
 
 /*
  * complete a domain join, when joining to a AD domain:

diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index e7a474811f5782b429ed63c67b7374aef59cc53b..7d738d8ee0edd1839e90ec52d1d2c85afb68a27c 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 "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 
 /*

diff --git a/source4/libnet/libnet_samdump_keytab.c b/source4/libnet/libnet_samdump_keytab.c
index de575ec66893913020910a805d3d6ff8f24b9298..ff527e2dfbc2ddfdb92dbd405ab6d1c04ef0c177 100644 (file)
--- a/source4/libnet/libnet_samdump_keytab.c
+++ b/source4/libnet/libnet_samdump_keytab.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "system/kerberos.h"
+#include "auth/credentials/credentials.h"
 
 static NTSTATUS samdump_keytab_handle_user(TALLOC_CTX *mem_ctx,
                                            const char *keytab_name,

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

diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index bea119d645d0a03b6a56c9f122da1edce135d08a..6e0fc0c743db5e8de4df34c06fdb493a7eae7d88 100644 (file)
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -30,6 +30,7 @@
 #include "libcli/smb_composite/smb_composite.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
+#include "auth/credentials/credentials.h"
 
 
 struct dcerpc_pipe_connect;

diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 93b385868db3e6eedfc9acc2fe7c2887bb74fa5b..8813270b1afd398cbbcad3eed8c2c818b6ea77d0 100644 (file)
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -29,6 +29,7 @@
 #include "librpc/gen_ndr/ndr_epmapper.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "auth/credentials/credentials.h"
 
 /*
   find a dcerpc call on an interface by name

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index 6c7a0274cf1df325882d01d66db241cfff76b6cc..952ebeb5756db932a2ce4b77cc1704eb041d60f3 100644 (file)
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -26,6 +26,7 @@
 #include "scripting/ejs/ejsnet.h"
 #include "libnet/libnet.h"
 #include "events/events.h"
+#include "auth/credentials/credentials.h"
 
 static int ejs_net_userman(MprVarHandle, int, struct MprVar**);
 static int ejs_net_createuser(MprVarHandle, int, char**);

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index bc69c0653de457f42e33bff90b21e0d26b4fafb6..914d163ec78bd1861cf947d6c7cc9b8fe289d1f6 100644 (file)
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -27,6 +27,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "libcli/libcli.h"
+#include "auth/credentials/credentials.h"
 
 #if 0
 

diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index a1b9446e9e693886aaa88653b41cc7497839bed8..c6ad64933bc8ef1b3084a4be0945b29ba7f9d44c 100644 (file)
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -24,6 +24,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/cmdline/popt_common.h"
+#include "auth/credentials/credentials.h"
 
 /*
   helper function to get the local objects credentials ptr

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 4527f7385a2fd77b4f7065c0f5dbb6e0be72569b..e666aa65ccf1743cfe3e034389e992708c4e4767 100644 (file)
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -30,6 +30,7 @@
 #include "dlinklist.h"
 #include "lib/events/events.h"
 #include "librpc/rpc/dcerpc_table.h"
+#include "auth/credentials/credentials.h"
 
 /*
   state of a irpc 'connection'

diff --git a/source4/torture/basic/secleak.c b/source4/torture/basic/secleak.c
index 20b7e8a5791a0b69ca86bc9dc9eac57fd413590c..eb0dad534dd20ccafea181ef7a406df79a076f50 100644 (file)
--- a/source4/torture/basic/secleak.c
+++ b/source4/torture/basic/secleak.c
@@ -26,6 +26,7 @@
 #include "libcli/libcli.h"
 #include "system/time.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "auth/credentials/credentials.h"
 
 static BOOL try_failed_login(struct smbcli_state *cli)
 {

diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index 7e0058cd9f1505cfaf083065176b178bc2063f17..8e6ec290fa52fe35a2f3099e9a57a8a2b9107ec4 100644 (file)
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/proto.h"
 #include "libcli/resolve/resolve.h"
 #include "system/network.h"

diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c
index bfcd2473e3fa4f0df2188493df3dc904d77d5e8a..e733009931b6eebe59d2d63dc4c6ce5ad38d54f0 100644 (file)
--- a/source4/torture/raw/context.c
+++ b/source4/torture/raw/context.c
@@ -26,6 +26,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "lib/events/events.h"
 #include "libcli/libcli.h"
+#include "auth/credentials/credentials.h"
 
 #define BASEDIR "\\rawcontext"
 

diff --git a/source4/torture/rpc/alter_context.c b/source4/torture/rpc/alter_context.c
index d75d367a1e634ec43b712e5a35cee80182128f32..b76cf605b2a475ca40b3536c237720548aeaba7c 100644 (file)
--- a/source4/torture/rpc/alter_context.c
+++ b/source4/torture/rpc/alter_context.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_dssetup.h"
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/proto.h"
 
 BOOL torture_rpc_alter_context(void)

diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index e63915992a3cd30a21652b1d2b0e2205d32da9c6..f23bb5586beb9cf99a16f70bc4971bb0dafa8ced 100644 (file)
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/drsuapi.h"
 #include "torture/rpc/proto.h"
 

diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index 227ddb200e12f04fcdb8677dbca4c53a7e97efee..0a44084dde48c3009d6782c6eaf8000bec668581 100644 (file)
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/drsuapi.h"
 #include "torture/rpc/proto.h"
 #include "ldb/include/ldb.h"

diff --git a/source4/torture/rpc/join.c b/source4/torture/rpc/join.c
index b9ffe32f2f42297d8425ad20bfdc306c2557c013..7dea5cdb26edd995f156476637f871344dd09716 100644 (file)
--- a/source4/torture/rpc/join.c
+++ b/source4/torture/rpc/join.c
@@ -1,6 +1,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/proto.h"
 
 #define TORTURE_NETBIOS_NAME "smbtorturejoin"

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

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 6d1b507c2b61a506857415161ac0067bfe49e85a..f5bbed1805166c0417b93e49f554d6f00a1baf88 100644 (file)
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "smb.h"
 #include "lib/crypto/crypto.h"
+#include "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 #include "libcli/security/proto.h"
 

diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index b5ff8bbfac60c91952ffdefeb97ac5fd20fbec95..41ad88d10999e198d010d29090a5edc40eba78d1 100644 (file)
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/proto.h"
 #include "lib/cmdline/popt_common.h"
 #include "auth/gensec/schannel_proto.h"

diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c
index b5f8889ded229dd924e5754d56b66f287e46b7b3..448c85c202ba9275a00f7d5f6c5f69c036ca3d93 100644 (file)
--- a/source4/torture/rpc/session_key.c
+++ b/source4/torture/rpc/session_key.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/proto.h"
 #include "libcli/auth/proto.h"
 

diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 9f39224b68d4cdc5819caac1a5eec409b4cb10b1..02b6366b1e5d4fc5a123e9d21f60d8904e3384b2 100644 (file)
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -34,6 +34,7 @@
 #include "smb.h"
 #include "lib/ldb/include/ldb.h"
 
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/proto.h"
 #include "libcli/security/proto.h"
 #include "libcli/auth/proto.h"

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 572733d59122696d966dd611d682d299ce3e1528..3236bbb89c39dcfae21e1a5a3a29d6527060c209 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -30,6 +30,7 @@
 #include "librpc/rpc/dcerpc_table.h"
 #include "lib/events/events.h"
 #include "libcli/resolve/resolve.h"
+#include "auth/credentials/credentials.h"
 
 #include "torture/basic/proto.h"
 #include "torture/raw/proto.h"

diff --git a/source4/utils/net/net_password.c b/source4/utils/net/net_password.c
index 8f6b989a5dafe3e8fa445510887431ce3481a6de..4c67f87b43d3525a8f6134f4709a747e797daec3 100644 (file)
--- a/source4/utils/net/net_password.c
+++ b/source4/utils/net/net_password.c
@@ -23,6 +23,7 @@
 #include "utils/net/net.h"
 #include "libnet/libnet.h"
 #include "system/filesys.h"
+#include "auth/credentials/credentials.h"
 
 /*
  * Code for Changing and setting a password

diff --git a/source4/utils/net/net_user.c b/source4/utils/net/net_user.c
index ecc1834fcf4883dde9ab9ec24e60547b19f6ca80..75eec9716d657a213c6193e0b24b9fca0e1a8713 100644 (file)
--- a/source4/utils/net/net_user.c
+++ b/source4/utils/net/net_user.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "utils/net/net.h"
 #include "libnet/libnet.h"
+#include "auth/credentials/credentials.h"
 
 static int net_user_add(struct net_context *ctx, int argc, const char **argv)
 {

diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c
index fbffebc0920920944ebccba84f53a5e30d3ff542..cf4c83d7671211490696c8014ae27ba6610cadc1 100644 (file)
--- a/source4/winbind/wb_async_helpers.c
+++ b/source4/winbind/wb_async_helpers.c
@@ -30,6 +30,7 @@
 #include "libcli/auth/credentials.h"
 #include "libcli/security/proto.h"
 #include "libcli/auth/proto.h"
+#include "auth/credentials/credentials.h"
 
 #include "winbind/wb_helper.h"
 

diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c
index 90371eb45725e2bf1da78eed81c7caf3d3da5056..4c286cc6e619683003d9254bfe93adac78be16ab 100644 (file)
--- a/source4/winbind/wb_init_domain.c
+++ b/source4/winbind/wb_init_domain.c
@@ -34,6 +34,7 @@
 
 #include "libcli/ldap/ldap_client.h"
 
+#include "auth/credentials/credentials.h"
 
 /*
  * Initialize a domain:

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