From ebae21f0235b957c8faeeb51c926724909d353e9 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 25 May 2010 20:19:22 +1000 Subject: [PATCH] ntlmssp: Make the ntlmssp.h from source3/ a common header MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The code is not yet in common, but I hope to fix that soon. Andrew Bartlett Signed-off-by: Stefan Metzmacher Signed-off-by: Günther Deschner --- {source3/include => libcli/auth}/ntlmssp.h | 0 source3/auth/auth_ntlmssp.c | 2 +- source3/libads/sasl.c | 2 +- source3/libsmb/cliconnect.c | 2 +- source3/libsmb/clifsinfo.c | 2 +- source3/libsmb/ntlmssp.c | 2 +- source3/libsmb/ntlmssp_sign.c | 2 +- source3/libsmb/smb_seal.c | 2 +- source3/rpc_client/cli_pipe.c | 2 +- source3/rpc_server/srv_pipe.c | 2 +- source3/smbd/seal.c | 2 +- source3/smbd/sesssetup.c | 2 +- source3/smbd/smb2_sesssetup.c | 2 +- source3/utils/ntlm_auth.c | 2 +- source3/winbindd/winbindd_ccache_access.c | 2 +- 15 files changed, 14 insertions(+), 14 deletions(-) rename {source3/include => libcli/auth}/ntlmssp.h (100%) 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 e4505eb1bdd..b455bc505f9 100644 --- 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 d6e4f68544a..8f7f6c11dfe 100644 --- 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 9ac3551d7ca..06a6f7e683f 100644 --- 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 2f5f31a6faa..2274df45855 100644 --- 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 8dcd26af179..7095426cabf 100644 --- 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 733998a14e6..20730928cca 100644 --- 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 ec879db5b42..cff237bc8b0 100644 --- 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 038e33ae8a4..0cd4d60b5d1 100644 --- 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 53acc1a68c3..ce087a4e034 100644 --- 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 4acf5b09b5e..171e809b445 100644 --- 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 4ac13988a52..7f99d6283c9 100644 --- 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 b659f2e2ef7..d91d0fe510a 100644 --- 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 79cf3f8af2c..e7887cca718 100644 --- 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 #include "../lib/crypto/arcfour.h" diff --git a/source3/winbindd/winbindd_ccache_access.c b/source3/winbindd/winbindd_ccache_access.c index 935d9fe1219..c5a760af052 100644 --- 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 -- 2.34.1