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/Makefile.in | 8 ++++---- source3/auth/auth_ntlmssp.c | 2 +- source3/libads/sasl.c | 2 +- source3/librpc/crypto/cli_spnego.c | 2 +- source3/librpc/rpc/dcerpc_helpers.c | 2 +- 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 +- source3/rpc_client/cli_pipe.c | 2 +- source3/rpc_server/dcesrv_ntlmssp.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 +- 18 files changed, 23 insertions(+), 23 deletions(-) (limited to 'source3') diff --git a/source3/Makefile.in b/source3/Makefile.in index 9e74d08ad9..89f3ec99bf 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -562,11 +562,11 @@ LIBSMB_OBJ0 = \ ../auth/gensec/gensec_start.o \ ../auth/credentials/credentials.o \ ../auth/credentials/credentials_samba3.o \ - ../libcli/auth/ntlmssp.o \ - ../libcli/auth/ntlmssp_sign.o \ + ../auth/ntlmssp/ntlmssp.o \ + ../auth/ntlmssp/ntlmssp_sign.o \ $(LIBNDR_NTLMSSP_OBJ) \ - ../libcli/auth/ntlmssp_ndr.o \ - ../libcli/auth/ntlmssp_server.o + ../auth/ntlmssp/ntlmssp_ndr.o \ + ../auth/ntlmssp/ntlmssp_server.o LIBSAMBA_OBJ = $(LIBSMB_OBJ0) \ $(LIBSMB_ERR_OBJ) diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c index 6f006bd38d..b4bc9f9c15 100644 --- a/source3/auth/auth_ntlmssp.c +++ b/source3/auth/auth_ntlmssp.c @@ -22,7 +22,7 @@ #include "includes.h" #include "auth.h" -#include "../libcli/auth/ntlmssp.h" +#include "../auth/ntlmssp/ntlmssp.h" #include "ntlmssp_wrap.h" #include "../librpc/gen_ndr/netlogon.h" #include "../lib/tsocket/tsocket.h" diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c index a3001863b8..a39971eafb 100644 --- a/source3/libads/sasl.c +++ b/source3/libads/sasl.c @@ -19,7 +19,7 @@ #include "includes.h" #include "../libcli/auth/spnego.h" -#include "../libcli/auth/ntlmssp.h" +#include "../auth/ntlmssp/ntlmssp.h" #include "ads.h" #include "smb_krb5.h" diff --git a/source3/librpc/crypto/cli_spnego.c b/source3/librpc/crypto/cli_spnego.c index 63a84a8838..3420e20d27 100644 --- a/source3/librpc/crypto/cli_spnego.c +++ b/source3/librpc/crypto/cli_spnego.c @@ -21,7 +21,7 @@ #include "../libcli/auth/spnego.h" #include "include/ntlmssp_wrap.h" #include "librpc/gen_ndr/ntlmssp.h" -#include "libcli/auth/ntlmssp.h" +#include "auth/ntlmssp/ntlmssp.h" #include "librpc/crypto/gse.h" #include "librpc/crypto/spnego.h" diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c index b53587ddb3..32dbfdfe48 100644 --- a/source3/librpc/rpc/dcerpc_helpers.c +++ b/source3/librpc/rpc/dcerpc_helpers.c @@ -24,7 +24,7 @@ #include "librpc/gen_ndr/ndr_schannel.h" #include "../libcli/auth/schannel.h" #include "../libcli/auth/spnego.h" -#include "../libcli/auth/ntlmssp.h" +#include "../auth/ntlmssp/ntlmssp.h" #include "ntlmssp_wrap.h" #include "librpc/crypto/gse.h" #include "librpc/crypto/spnego.h" 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" diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index ae5b88f02c..65bc028c41 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -25,7 +25,7 @@ #include "../librpc/gen_ndr/ndr_dssetup.h" #include "../libcli/auth/schannel.h" #include "../libcli/auth/spnego.h" -#include "../libcli/auth/ntlmssp.h" +#include "../auth/ntlmssp/ntlmssp.h" #include "ntlmssp_wrap.h" #include "librpc/gen_ndr/ndr_dcerpc.h" #include "librpc/rpc/dcerpc.h" diff --git a/source3/rpc_server/dcesrv_ntlmssp.c b/source3/rpc_server/dcesrv_ntlmssp.c index a31bb36284..076a48da43 100644 --- a/source3/rpc_server/dcesrv_ntlmssp.c +++ b/source3/rpc_server/dcesrv_ntlmssp.c @@ -20,7 +20,7 @@ #include "includes.h" #include "rpc_server/dcesrv_ntlmssp.h" -#include "../libcli/auth/ntlmssp.h" +#include "../auth/ntlmssp/ntlmssp.h" #include "ntlmssp_wrap.h" #include "auth.h" diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c index c0aaa5ab7d..b19c9ede3d 100644 --- a/source3/smbd/seal.c +++ b/source3/smbd/seal.c @@ -21,7 +21,7 @@ #include "smbd/smbd.h" #include "smbd/globals.h" #include "../libcli/auth/spnego.h" -#include "../libcli/auth/ntlmssp.h" +#include "../auth/ntlmssp/ntlmssp.h" #include "ntlmssp_wrap.h" #include "smb_crypt.h" #include "../lib/util/asn1.h" diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 28ae24e95f..4d48e73f92 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -27,7 +27,7 @@ #include "smbd/smbd.h" #include "smbd/globals.h" #include "../libcli/auth/spnego.h" -#include "../libcli/auth/ntlmssp.h" +#include "../auth/ntlmssp/ntlmssp.h" #include "ntlmssp_wrap.h" #include "../librpc/gen_ndr/krb5pac.h" #include "libads/kerberos_proto.h" diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c index e645770014..ece5de1282 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -24,8 +24,8 @@ #include "smbd/globals.h" #include "../libcli/smb/smb_common.h" #include "../libcli/auth/spnego.h" -#include "../libcli/auth/ntlmssp.h" #include "../auth/gensec/gensec.h" +#include "../auth/ntlmssp/ntlmssp.h" #include "ntlmssp_wrap.h" #include "../librpc/gen_ndr/krb5pac.h" #include "libads/kerberos_proto.h" diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index 9cd47d0611..00c7d4dbba 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -28,7 +28,7 @@ #include "utils/ntlm_auth.h" #include "../libcli/auth/libcli_auth.h" #include "../libcli/auth/spnego.h" -#include "../libcli/auth/ntlmssp.h" +#include "../auth/ntlmssp/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 0b52ae2eb9..37e8eee727 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 "../libcli/auth/ntlmssp.h" +#include "../auth/ntlmssp/ntlmssp.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND -- cgit