r3453: - split out the auth and popt includes

- tidied up some of the system includes

- moved a few more structures back from misc.idl to netlogon.idl and samr.idl now that pidl
  knows about inter-IDL dependencies
(This used to be commit 7b7477ac42d96faac1b0ff361525d2c63cedfc64)

13 files changed, 12 insertions, 4 deletions

diff --git a/source4/libcli/auth/credentials.c b/source4/libcli/auth/credentials.c
index f3f8324005..4a17b13910 100644
--- a/source4/libcli/auth/credentials.c
+++ b/source4/libcli/auth/credentials.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "auth/auth.h"
 
 /*
   initialise the credentials state for old-style 64 bit session keys
diff --git a/source4/libcli/auth/gensec.c b/source4/libcli/auth/gensec.c
index a00a36e171..aab1928687 100644
--- a/source4/libcli/auth/gensec.c
+++ b/source4/libcli/auth/gensec.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 /* the list of currently registered GENSEC backends */
 const static struct gensec_security_ops **generic_security_ops;
diff --git a/source4/libcli/auth/gensec.h b/source4/libcli/auth/gensec.h
index 624c7ebe1d..b2c685332b 100644
--- a/source4/libcli/auth/gensec.h
+++ b/source4/libcli/auth/gensec.h
@@ -82,9 +82,6 @@ struct gensec_security_ops {
 	void (*end)(struct gensec_security *gensec_security);
 };
 	
-typedef NTSTATUS (*gensec_password_callback)(struct gensec_security *gensec_security, TALLOC_CTX *mem_ctx, 
-					     char **password);
-
 #define GENSEC_INTERFACE_VERSION 0
 
 struct gensec_security {
diff --git a/source4/libcli/auth/gensec_krb5.c b/source4/libcli/auth/gensec_krb5.c
index f393ce09c1..0e374e8219 100644
--- a/source4/libcli/auth/gensec_krb5.c
+++ b/source4/libcli/auth/gensec_krb5.c
@@ -27,6 +27,7 @@
 #include "system/kerberos.h"
 #include "libcli/auth/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "auth/auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
diff --git a/source4/libcli/auth/gensec_ntlmssp.c b/source4/libcli/auth/gensec_ntlmssp.c
index f75e7b4d73..4b1d5f3b02 100644
--- a/source4/libcli/auth/gensec_ntlmssp.c
+++ b/source4/libcli/auth/gensec_ntlmssp.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 struct gensec_ntlmssp_state {
 	struct auth_context *auth_context;
diff --git a/source4/libcli/auth/ntlmssp.c b/source4/libcli/auth/ntlmssp.c
index 2ea0bcb84e..96c733e3b0 100644
--- a/source4/libcli/auth/ntlmssp.c
+++ b/source4/libcli/auth/ntlmssp.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state, 
 				       TALLOC_CTX *out_mem_ctx, 
diff --git a/source4/libcli/auth/ntlmssp_sign.c b/source4/libcli/auth/ntlmssp_sign.c
index 5a99f14496..689a2d353e 100644
--- a/source4/libcli/auth/ntlmssp_sign.c
+++ b/source4/libcli/auth/ntlmssp_sign.c
@@ -21,6 +21,7 @@
  */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 #define CLI_SIGN "session key to client-to-server signing key magic constant"
 #define CLI_SEAL "session key to client-to-server sealing key magic constant"
diff --git a/source4/libcli/auth/spnego.c b/source4/libcli/auth/spnego.c
index 2779f47474..ef9763cad7 100644
--- a/source4/libcli/auth/spnego.c
+++ b/source4/libcli/auth/spnego.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
diff --git a/source4/libcli/auth/spnego_parse.c b/source4/libcli/auth/spnego_parse.c
index 12d3d05734..d6eacc4a6a 100644
--- a/source4/libcli/auth/spnego_parse.c
+++ b/source4/libcli/auth/spnego_parse.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index 2949633b86..2c66a1b5b3 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 
 /*
diff --git a/source4/libcli/ldap/ldap.c b/source4/libcli/ldap/ldap.c
index 987a822219..9b481313e3 100644
--- a/source4/libcli/ldap/ldap.c
+++ b/source4/libcli/ldap/ldap.c
@@ -26,6 +26,7 @@
 #include "includes.h"
 #include "system/network.h"
 #include "system/iconv.h"
+#include "auth/auth.h"
 
 /****************************************************************************
  *
diff --git a/source4/libcli/raw/clisession.c b/source4/libcli/raw/clisession.c
index 14018f676c..23e1d8507e 100644
--- a/source4/libcli/raw/clisession.c
+++ b/source4/libcli/raw/clisession.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "auth/auth.h"
 
 #define SETUP_REQUEST_SESSION(cmd, wct, buflen) do { \
 	req = smbcli_request_setup_session(session, cmd, wct, buflen); \
diff --git a/source4/libcli/util/smbencrypt.c b/source4/libcli/util/smbencrypt.c
index 1cf0890ba8..1e911f094b 100644
--- a/source4/libcli/util/smbencrypt.c
+++ b/source4/libcli/util/smbencrypt.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 #include "system/time.h"
-#include "byteorder.h"
+#include "auth/auth.h"
 
 /*
    This implements the X/Open SMB password encryption