s3-crypto: only include crypto headers when crypto is done.

Guenther

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 1f8338160619557f18b19b97c61c368eeea066eb..34c8190ee8c16f6757e533c9559a84efac1db6bb 100644 (file)
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../lib/crypto/arcfour.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index b968c1ddedc84b481b32feb9bbe1dcb5fe87e7bd..767ae5e7b613b955daf4281a9f8837fe565c3b68 100644 (file)
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "../lib/crypto/arcfour.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source3/include/includes.h b/source3/include/includes.h
index a6d8d5a5655c25d0b5cb485aa097c0e025a258a5..8746a5c176209c42e5b79c6924d82f5ec89838f2 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -652,11 +652,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "passdb.h"
 #include "rpc_secdes.h"
 #include "msdfs.h"
-#include "../lib/crypto/md5.h"
-#include "../lib/crypto/md4.h"
-#include "../lib/crypto/arcfour.h"
-#include "../lib/crypto/crc32.h"
-#include "../lib/crypto/hmacmd5.h"
 
 struct ntlmssp_state;
 

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index 80e5a41893158c53ff4e2c8db734ee31e0a32fab..be4cc0a8fb035ddc7a1a45a6b266949f5f07f597 100644 (file)
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/rap.h"
+#include "../lib/crypto/arcfour.h"
 
 /****************************************************************************
  Call a remote api

diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index 56dd6d9ab7996b24186491c73aa72f7a455f4a80..12955d8d015207ea6132474458a8d4ee86b7663e 100644 (file)
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -26,6 +26,9 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/ndr_ntlmssp.h"
 #include "../libcli/auth/ntlmssp_ndr.h"
+#include "../lib/crypto/md5.h"
+#include "../lib/crypto/arcfour.h"
+#include "../lib/crypto/hmacmd5.h"
 
 static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state,
                                       DATA_BLOB reply, DATA_BLOB *next_request);

diff --git a/source3/libsmb/ntlmssp_sign.c b/source3/libsmb/ntlmssp_sign.c
index 331bf1127a9ea9cd02d95cf240a52d1edb33270f..733998a14e6cb47ba10505fb6d5407890d6e704e 100644 (file)
--- a/source3/libsmb/ntlmssp_sign.c
+++ b/source3/libsmb/ntlmssp_sign.c
@@ -21,6 +21,10 @@
 #include "includes.h"
 #include "ntlmssp.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../lib/crypto/md5.h"
+#include "../lib/crypto/arcfour.h"
+#include "../lib/crypto/hmacmd5.h"
+#include "../lib/crypto/crc32.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/source3/libsmb/smb_signing.c b/source3/libsmb/smb_signing.c
index 104cf76160fe04dac50df8071a7d3562af500d8a..d4b350f7a407e6c9fd893dba1ea1663caf2b9c20 100644 (file)
--- a/source3/libsmb/smb_signing.c
+++ b/source3/libsmb/smb_signing.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "../lib/crypto/md5.h"
 
 /* Used by the SMB signing functions. */
 

diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
index d7c0a834c0038b10db8f7efc659b4bd19b317edf..aa7ef080e648b2567b9d3dccd9e4ebaf33b2e80e 100644 (file)
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -22,6 +22,7 @@
  */
 
 #include "includes.h"
+#include "../lib/crypto/md5.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 21cc2f6268bc8a9790502963acc1cda6319b2096..36d682b6246528a55e61620ce387283281678113 100644 (file)
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_samr.h"
+#include "../lib/crypto/arcfour.h"
 
 /* User change password */
 

diff --git a/source3/rpc_client/init_netlogon.c b/source3/rpc_client/init_netlogon.c
index d197ff74b22d01227760b09b79329cd2106d687a..a1728834e7495cd358b48333a63b3a16c00903fe 100644 (file)
--- a/source3/rpc_client/init_netlogon.c
+++ b/source3/rpc_client/init_netlogon.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../lib/crypto/arcfour.h"
 
 /*************************************************************************
  inits a netr_CryptPassword structure

diff --git a/source3/rpc_client/init_samr.c b/source3/rpc_client/init_samr.c
index 68438699650802fab7a8bb1ce7f5dece289ea6c7..ecab28e719fc15974065ca6ec4c5462858f48695 100644 (file)
--- a/source3/rpc_client/init_samr.c
+++ b/source3/rpc_client/init_samr.c
@@ -19,6 +19,8 @@
 
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../lib/crypto/md5.h"
+#include "../lib/crypto/arcfour.h"
 
 /*************************************************************************
  inits a samr_CryptPasswordEx structure

diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index fc1bdf0b2d39ead185a52a86c2b88b56c1340455..ee87fa8623266cd73d752115ed6bd509dadbad0d 100644 (file)
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -28,6 +28,7 @@
 #include "../libcli/auth/schannel.h"
 #include "../librpc/gen_ndr/srv_netlogon.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "../lib/crypto/md4.h"
 
 extern userdom_struct current_user_info;
 

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 5e786a0404b1c564ed7c2f5c26737dbd0000395a..832ada5bc1d977297014a581733d69f5078b9fbe 100644 (file)
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -36,6 +36,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/srv_samr.h"
 #include "rpc_server/srv_samr_util.h"
+#include "../lib/crypto/arcfour.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index 32ddefb429445400ee3960a2e7421efa8ab5ed8e..735f57d0dfa96057bc8ce7f701903ffe1c652f5f 100644 (file)
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -47,6 +47,7 @@
 
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../lib/crypto/arcfour.h"
 
 static NTSTATUS check_oem_password(const char *user,
                                   uchar password_encrypted_with_lm_hash[516],

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 2c8dbfc7c8eb5a1a8ba1a5fe91063fe66ca894f2..79cf3f8af2c9ab3f7e726cd0d207486157747f2e 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -30,6 +30,7 @@
 #include "ntlmssp.h"
 #include "smb_krb5.h"
 #include <iniparser.h>
+#include "../lib/crypto/arcfour.h"
 
 #ifndef PAM_WINBIND_CONFIG_FILE
 #define PAM_WINBIND_CONFIG_FILE "/etc/security/pam_winbind.conf"

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 34f1fbc341641d7032fb2d8ef905f6953d2ef352..de08a66bc7171e20970a2439d23c8438ec119561 100644 (file)
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -28,6 +28,7 @@
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "smb_krb5.h"
+#include "../lib/crypto/arcfour.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND