ntlmssp: Make the ntlmssp.h from source3/ a common header

The code is not yet in common, but I hope to fix that soon.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>

diff --git a/source3/include/ntlmssp.h b/libcli/auth/ntlmssp.h
similarity index 100%
rename from source3/include/ntlmssp.h
rename to libcli/auth/ntlmssp.h

diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index e4505eb1bdd73f221f934b22f65ca3f01d513d38..b455bc505f9fb4a09238c2f565841904f346bce8 100644 (file)
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "ntlmssp.h"
+#include "../libcli/auth/ntlmssp.h"
 
 struct auth_ntlmssp_state {
        TALLOC_CTX *mem_ctx;

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

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

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

diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index 8dcd26af1795ed71e29b0928f871a9b45f7ba017..7095426cabf1bb07e29016a68ed68786eb66d426 100644 (file)
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "ntlmssp.h"
+#include "../libcli/auth/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 733998a14e6cb47ba10505fb6d5407890d6e704e..20730928cca112abd0247a5a59188f2a729e5ff0 100644 (file)
--- a/source3/libsmb/ntlmssp_sign.c
+++ b/source3/libsmb/ntlmssp_sign.c
@@ -19,7 +19,7 @@
  */
 
 #include "includes.h"
-#include "ntlmssp.h"
+#include "../libcli/auth/ntlmssp.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../lib/crypto/md5.h"
 #include "../lib/crypto/arcfour.h"

diff --git a/source3/libsmb/smb_seal.c b/source3/libsmb/smb_seal.c
index ec879db5b42cb4b65f2585cf21fd18106f4d264a..cff237bc8b0c474b8bc43b345b65e5e8172489db 100644 (file)
--- a/source3/libsmb/smb_seal.c
+++ b/source3/libsmb/smb_seal.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "ntlmssp.h"
+#include "../libcli/auth/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 038e33ae8a475a30a5fd3bbe412c1fa19e740ace..0cd4d60b5d1365a6c77b7b6eb4733d6f8dc7431b 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -39,7 +39,7 @@
 #include "../libcli/auth/schannel.h"
 #include "../libcli/auth/spnego.h"
 #include "smb_krb5.h"
-#include "ntlmssp.h"
+#include "../libcli/auth/ntlmssp.h"
 #include "rpc_client/cli_netlogon.h"
 
 #undef DBGC_CLASS

diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 53acc1a68c368831b91bbe99ba175d8c73769765..ce087a4e034e52c30c0d23128a22b870e5e046b3 100644 (file)
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -31,7 +31,7 @@
 #include "../librpc/gen_ndr/ndr_schannel.h"
 #include "../libcli/auth/schannel.h"
 #include "../libcli/auth/spnego.h"
-#include "ntlmssp.h"
+#include "../libcli/auth/ntlmssp.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index 4acf5b09b5ea425b14c9d0d7add605d6e0e6e966..171e809b44575ed7bab0fba2afbd1ac0cbd2b434 100644 (file)
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/spnego.h"
-#include "ntlmssp.h"
+#include "../libcli/auth/ntlmssp.h"
 
 /******************************************************************************
  Server side encryption.

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 4ac13988a52c6cdb9c5170f75af6e93a47b7b69c..7f99d6283c9898ac28f9a4a1dfdee424aa419aa9 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/spnego.h"
-#include "ntlmssp.h"
+#include "../libcli/auth/ntlmssp.h"
 #include "librpc/gen_ndr/messaging.h"
 
 /* For split krb5 SPNEGO blobs. */

diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index b659f2e2ef7bde5506bdf29271b49a99e5083549..d91d0fe510a0891e58221acbf6f038b8248e3115 100644 (file)
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -23,7 +23,7 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../libcli/auth/spnego.h"
-#include "ntlmssp.h"
+#include "../libcli/auth/ntlmssp.h"
 
 static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *smb2req,
                                        uint64_t in_session_id,

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 79cf3f8af2c9ab3f7e726cd0d207486157747f2e..e7887cca718b9a4e3b9563a0376a8ae9f1e8b850 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -27,7 +27,7 @@
 #include "utils/ntlm_auth.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../libcli/auth/spnego.h"
-#include "ntlmssp.h"
+#include "../libcli/auth/ntlmssp.h"
 #include "smb_krb5.h"
 #include <iniparser.h>
 #include "../lib/crypto/arcfour.h"

diff --git a/source3/winbindd/winbindd_ccache_access.c b/source3/winbindd/winbindd_ccache_access.c
index 935d9fe1219522d28d21e0a8fda8602a0cfe0475..c5a760af05210b2cfe09bf569f5584e03ddbe8be 100644 (file)
--- a/source3/winbindd/winbindd_ccache_access.c
+++ b/source3/winbindd/winbindd_ccache_access.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "ntlmssp.h"
+#include "../libcli/auth/ntlmssp.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND