s3:ntlmssp: only include ntlmssp.h where actually needed

Andrew Bartlett

diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index 034d354a33712e3a9c665247ae7b5e823580776f..f95a2359090330b2a0e12457c326d92de92d2024 100644 (file)
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "ntlmssp.h"
 
 /**
  * Return the challenge as determined by the authentication subsystem 

diff --git a/source3/include/includes.h b/source3/include/includes.h
index cf0979592c823a8a080c18105e14bce4b9c400ff..d9d51a8a992b0049d119f6fd53d4e72f1877450a 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -659,7 +659,9 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "../lib/crypto/arcfour.h"
 #include "../lib/crypto/crc32.h"
 #include "../lib/crypto/hmacmd5.h"
-#include "ntlmssp.h"
+
+struct ntlmssp_state;
+
 #include "auth.h"
 #include "ntdomain.h"
 #include "reg_objects.h"

diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index 9b4d8bd2d444589ab56686c2544125ed78f3300a..6a0a1ae3d201b5aaabbbadfb560dcbea20ca5d36 100644 (file)
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "../libcli/auth/spnego.h"
+#include "ntlmssp.h"
 
 #ifdef HAVE_LDAP
 

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 715ea913822ed50382acee7a7325f4731baa76c4..dccc91425ce1f3a80dadf4351f883b15694d1f8c 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -22,6 +22,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../libcli/auth/spnego.h"
 #include "smb_krb5.h"
+#include "ntlmssp.h"
 
 static const struct {
        int prot;

diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index ec690b4d823e9448d651508aa43f61d56585cfbc..38382e4af7761e4725c79856d5e8a52f111fc1de 100644 (file)
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "../libcli/auth/spnego.h"
+#include "ntlmssp.h"
 
 /****************************************************************************
  Get UNIX extensions version info.

diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index 8f1b61619383c6c1ca22fe7b916f4fa289f98d6c..065d3b91cd29be7e01ee6c396e45be1067ea3f04 100644 (file)
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "ntlmssp.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/ndr_ntlmssp.h"
 #include "../libcli/auth/ntlmssp_ndr.h"

diff --git a/source3/libsmb/ntlmssp_sign.c b/source3/libsmb/ntlmssp_sign.c
index e1e4604cc2446a839a596187c7e9a140568a3d3e..f27cac38af2937305dc4727464be6fb0ccd10a9c 100644 (file)
--- a/source3/libsmb/ntlmssp_sign.c
+++ b/source3/libsmb/ntlmssp_sign.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "ntlmssp.h"
 #include "../libcli/auth/libcli_auth.h"
 
 #define CLI_SIGN "session key to client-to-server signing key magic constant"

diff --git a/source3/libsmb/smb_seal.c b/source3/libsmb/smb_seal.c
index bb6303f705c760105afa83fc5ec91520785012c8..ec879db5b42cb4b65f2585cf21fd18106f4d264a 100644 (file)
--- a/source3/libsmb/smb_seal.c
+++ b/source3/libsmb/smb_seal.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "ntlmssp.h"
 
 /******************************************************************************
  Pull out the encryption context for this packet. 0 means global context.

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index c4781f7568443b10aba8481eaf3a99addf200b75..96531666d541603859386efe34a143a0594450ea 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -23,6 +23,7 @@
 #include "../libcli/auth/schannel.h"
 #include "../libcli/auth/spnego.h"
 #include "smb_krb5.h"
+#include "ntlmssp.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_CLI

diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 46f67f499b100fc6a2163015ac20486adb4c0c09..f92a100d0a90c36e39f2bcbb197d7d503ce6cf55 100644 (file)
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -31,6 +31,7 @@
 #include "../librpc/gen_ndr/ndr_schannel.h"
 #include "../libcli/auth/schannel.h"
 #include "../libcli/auth/spnego.h"
+#include "ntlmssp.h"
 
 extern struct current_user current_user;
 

diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index 2d738cbd129e2343fc664bbc161b06679e9d6736..700d7ea02e2e3d22be0403202fba276de8f996e9 100644 (file)
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/spnego.h"
+#include "ntlmssp.h"
 
 /******************************************************************************
  Server side encryption.

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index addd386fb4fcc1c9288d17dfc5e8f461c60db8b0..612cf2231ae96dcaa7ee72a71205be620cf14d80 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/spnego.h"
+#include "ntlmssp.h"
 
 /* For split krb5 SPNEGO blobs. */
 struct pending_auth_data {

diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index dc24124b54708692cb0ea9d0c14f341068bbad01..0df4bd6c564fff5e0415f7398e6b2b4d1d1e0cfe 100644 (file)
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -22,6 +22,7 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../libcli/auth/spnego.h"
+#include "ntlmssp.h"
 
 static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *req,
                                        uint64_t in_session_id,

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index bdbead9f999d4458558381873768c86a7907317e..57e425154385daa94c906f0146ebd45b27bcc4c9 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -27,6 +27,7 @@
 #include "utils/ntlm_auth.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../libcli/auth/spnego.h"
+#include "ntlmssp.h"
 #include "smb_krb5.h"
 #include <iniparser.h>
 

diff --git a/source3/winbindd/winbindd_ccache_access.c b/source3/winbindd/winbindd_ccache_access.c
index b57381ce9a7be78478f0ef9623e945dc1f16fdfd..f8f9ddfad5c4b1c138d00ef94f3a6c1ab91670e0 100644 (file)
--- a/source3/winbindd/winbindd_ccache_access.c
+++ b/source3/winbindd/winbindd_ccache_access.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "ntlmssp.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND