From 0c6e4adcb26557ae6e55169c051f0260151dc5d9 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 25 Jul 2011 16:04:38 +1000 Subject: ntlmssp: Move ntlmssp code to auth/ntlmssp This brings in the code from both libcli/auth and source4/auth/ntlmssp. Andrew Bartlett Signed-off-by: Stefan Metzmacher --- source3/libsmb/cliconnect.c | 2 +- source3/libsmb/clifsinfo.c | 2 +- source3/libsmb/ntlmssp.c | 6 +++--- source3/libsmb/ntlmssp_wrap.c | 2 +- source3/libsmb/smb2cli_session.c | 2 +- source3/libsmb/smb_seal.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/libsmb') diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index e4402ba20f..da47bc512c 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -26,7 +26,7 @@ #include "../libcli/auth/libcli_auth.h" #include "../libcli/auth/spnego.h" #include "smb_krb5.h" -#include "../libcli/auth/ntlmssp.h" +#include "../auth/ntlmssp/ntlmssp.h" #include "libads/kerberos_proto.h" #include "krb5_env.h" #include "../lib/util/tevent_ntstatus.h" diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c index 9005d4dac4..12961c9390 100644 --- a/source3/libsmb/clifsinfo.c +++ b/source3/libsmb/clifsinfo.c @@ -21,7 +21,7 @@ #include "includes.h" #include "libsmb/libsmb.h" #include "../libcli/auth/spnego.h" -#include "../libcli/auth/ntlmssp.h" +#include "../auth/ntlmssp/ntlmssp.h" #include "../lib/util/tevent_ntstatus.h" #include "async_smb.h" #include "smb_crypt.h" diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c index 9436ca1c3f..01cc1cc02e 100644 --- a/source3/libsmb/ntlmssp.c +++ b/source3/libsmb/ntlmssp.c @@ -22,11 +22,11 @@ */ #include "includes.h" -#include "../libcli/auth/ntlmssp.h" -#include "../libcli/auth/ntlmssp_private.h" +#include "../auth/ntlmssp/ntlmssp.h" +#include "../auth/ntlmssp/ntlmssp_private.h" #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/ndr_ntlmssp.h" -#include "../libcli/auth/ntlmssp_ndr.h" +#include "../auth/ntlmssp/ntlmssp_ndr.h" #include "../lib/crypto/md5.h" #include "../lib/crypto/arcfour.h" #include "../lib/crypto/hmacmd5.h" diff --git a/source3/libsmb/ntlmssp_wrap.c b/source3/libsmb/ntlmssp_wrap.c index 0f6991c92f..b90399c559 100644 --- a/source3/libsmb/ntlmssp_wrap.c +++ b/source3/libsmb/ntlmssp_wrap.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "libcli/auth/ntlmssp.h" +#include "auth/ntlmssp/ntlmssp.h" #include "ntlmssp_wrap.h" #include "auth/gensec/gensec.h" diff --git a/source3/libsmb/smb2cli_session.c b/source3/libsmb/smb2cli_session.c index 58204be772..f09932a5d5 100644 --- a/source3/libsmb/smb2cli_session.c +++ b/source3/libsmb/smb2cli_session.c @@ -25,7 +25,7 @@ #include "libsmb/proto.h" #include "lib/util/tevent_ntstatus.h" #include "../libcli/auth/spnego.h" -#include "../libcli/auth/ntlmssp.h" +#include "../auth/ntlmssp/ntlmssp.h" struct smb2cli_session_setup_state { uint8_t fixed[24]; diff --git a/source3/libsmb/smb_seal.c b/source3/libsmb/smb_seal.c index 65ccdbbeab..1c7bec3889 100644 --- a/source3/libsmb/smb_seal.c +++ b/source3/libsmb/smb_seal.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "../libcli/auth/ntlmssp.h" +#include "../auth/ntlmssp/ntlmssp.h" #include "smb_crypt.h" #include "libsmb/libsmb.h" #include "ntlmssp_wrap.h" -- cgit