r10528: Add credentials.h back into includes.h as some compilers don't

seem to be able to handle incomplete enum types.
(This used to be commit 540155fad3c8e3d79fb631bb3f14273f82130a73)

diff --git a/source4/client/client.c b/source4/client/client.c
index ff41cba7e0a52fe671058a88a15a40df6399ea7c..62841af23eef761f13d74b3d6ccd0d7efed0e074 100644 (file)
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -32,7 +32,6 @@
 #include "system/dir.h"
 #include "system/filesys.h"
 #include "dlinklist.h"
-#include "credentials.h"
 #include "system/readline.h"
 #include "pstring.h"
 

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

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 78481ac6795ae8a3119fc4e69717aabcb1cf3125..ee1ac6d96e5586d8ef175356364877aac0ee1e5b 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -114,6 +114,7 @@ struct ipv4_addr {
 #include "ntvfs/ntvfs.h"
 #include "cli_context.h"
 #include "lib/com/com.h"
+#include "credentials.h"
 
 #define malloc_p(type) (type *)malloc(sizeof(type))
 #define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)

diff --git a/source4/include/structs.h b/source4/include/structs.h
index e09d9bb242c918f3c35cf047f736493f23426f56..ca28c1fc7af2e52997fd62af01da4d3ac78fe330 100644 (file)
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -297,7 +297,3 @@ struct ldb_map_objectclass;
 struct param_context;
 struct param_section;
 struct param;
-
-enum credentials_obtained;
-struct cli_credentials;
-struct ccache_container;

diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index 76c8a537e3ce86a9cae74e1517f4f4fc7a968b4a..43ea203b78bc9d02c6880a2fcd8c1f56412ec5d8 100644 (file)
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -25,7 +25,6 @@
 #include "system/filesys.h"
 #include "system/passwd.h"
 #include "lib/cmdline/popt_common.h"
-#include "credentials.h"
 
 /* Handle command line options:
  *             -d,--debuglevel 

diff --git a/source4/lib/credentials.c b/source4/lib/credentials.c
index 166d60b00d3f691e23b697cb390b8db20f02afd8..045047d358a9f6728810f6462aaedf6d299c96b3 100644 (file)
--- a/source4/lib/credentials.c
+++ b/source4/lib/credentials.c
@@ -27,7 +27,6 @@
 #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include "include/credentials.h"
 
 
 /**

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

diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index 04ed1fd7d9cf816539d116b8740a57756047ce07..789f24259a4ec3b87387c04bfee10d37c9a6d097 100644 (file)
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -32,7 +32,6 @@
 #include "libcli/smb_composite/smb_composite.h"
 #include "smb_server/smb_server.h"
 #include "smbd/service_stream.h"
-#include "credentials.h"
 
 /* this is stored in ntvfs_private */
 struct cvfs_private {

diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c
index 08734493ba7ce0667d7800aeec6f60a08ccd304a..9e77347fa72d788d99f7a978a945ac7ad8f5cb8f 100644 (file)
--- a/source4/rpc_server/remote/dcesrv_remote.c
+++ b/source4/rpc_server/remote/dcesrv_remote.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "rpc_server/dcerpc_server.h"
-#include "credentials.h"
 
 struct dcesrv_remote_private {
        struct dcerpc_pipe *c_pipe;

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index 3b0905d7d30f9382d806bb44875230955206bbb0..d7ffea29fe81babc7c477bcd98d870b5c79d8d88 100644 (file)
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -26,7 +26,6 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "clilist.h"
-#include "credentials.h"
 
 #if 0
 

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

diff --git a/source4/torture/basic/secleak.c b/source4/torture/basic/secleak.c
index 2a1c5b15d519ad8c99598dbf0d7c544d618d5ba4..f77b399874801ed022dc2fa1eed6e3402ebb2dfd 100644 (file)
--- a/source4/torture/basic/secleak.c
+++ b/source4/torture/basic/secleak.c
@@ -24,7 +24,6 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "libcli/composite/composite.h"
-#include "credentials.h"
 #include "libcli/smb_composite/smb_composite.h"
 
 static BOOL try_failed_login(struct smbcli_state *cli)

diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 2765df35f04497406f9c7f82ff4ff8d6a21d6294..8a2bba8497d0e84b66456cfe772dfe78bd9c9c30 100644 (file)
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -24,7 +24,6 @@
 #include "request.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "credentials.h"
 
 #define NSERVERS 2
 #define NINSTANCES 2

diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index 980fc6287cb1e8275176b3deb0779ae18efd0147..be363d0cb3942cd4eefc686a94bdab9c9bd82322 100644 (file)
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -22,7 +22,6 @@
 #include "system/filesys.h"
 #include "system/time.h"
 #include "pstring.h"
-#include "credentials.h"
 
 static int numops = 1000;
 static BOOL showall;

diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index b432c7129a597d4960d1e3a02eb4ab4a4e260a09..0b1c58a2f257e8596b450f9972f180a769052434 100644 (file)
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -23,7 +23,6 @@
 #include "clilist.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
-#include "credentials.h"
 #include "pstring.h"
 
 static struct cli_credentials *credentials;

diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index 8fa784c624fc42d9cc08be67c4c04bc5e467dc33..ef0ccd9037e6595ab58d0d26b8409794f2b158d7 100644 (file)
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -27,7 +27,6 @@
 #include "auth/auth.h"
 #include "lib/crypto/crypto.h"
 #include "lib/cmdline/popt_common.h"
-#include "credentials.h"
 
 #define TEST_MACHINE_NAME "samlogontest"
 #define TEST_USER_NAME "samlogontestuser"

diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 1f526ff7bcb72ace4d0b1dbf08b26b5663e42402..9cd30ef019c9902f893ecec35df7e85c3eabc6e0 100644 (file)
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -28,7 +28,6 @@
 #include "dlinklist.h"
 #include "lib/crypto/crypto.h"
 #include "system/time.h"
-#include "credentials.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 d5df777451bedb15e87eb4a7587d51aa0d1b3f26..c10405354e7da54c2ca9f1a82b1817f4cde33e90 100644 (file)
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -24,7 +24,6 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "lib/cmdline/popt_common.h"
-#include "credentials.h"
 
 #define TEST_MACHINE_NAME "schanneltest"
 

diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c
index d2be631d9954e49835d2cbf81142565ae7e9339d..3b94640f227cfecc7c7204ecbf45b7b12aad42a8 100644 (file)
--- a/source4/utils/ntlm_auth.c
+++ b/source4/utils/ntlm_auth.c
@@ -28,7 +28,6 @@
 #include "lib/cmdline/popt_common.h"
 #include "auth/auth.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "credentials.h"
 #include "pstring.h"
 
 #define SQUID_BUFFER_SIZE 2010