diff options
| author | Simo Sorce <idra@samba.org> | 2010-09-02 17:50:21 -0400 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-09-23 10:54:22 -0700 |
| commit | 2c9f420d75ac0a231b84c2d85e9470bb595d6daf (patch) | |
| tree | cc2e0492cc07d2bb0bcdd6d7dc38afd52be220a4 | |
| parent | 59722ef2fb6973ac06de5c17c3f84995bac20816 (diff) | |
| download | samba-2c9f420d75ac0a231b84c2d85e9470bb595d6daf.tar.gz samba-2c9f420d75ac0a231b84c2d85e9470bb595d6daf.tar.bz2 samba-2c9f420d75ac0a231b84c2d85e9470bb595d6daf.zip | |
s3-dcerpc: move client spnego stuff in /librpc/crypto
Signed-off-by: Günther Deschner <gd@samba.org>
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/librpc/crypto/cli_spnego.c (renamed from source3/librpc/rpc/dcerpc_spnego.c) | 3 | ||||
| -rw-r--r-- | source3/librpc/crypto/spnego.h (renamed from source3/librpc/rpc/dcerpc_spnego.h) | 6 | ||||
| -rw-r--r-- | source3/librpc/rpc/dcerpc_helpers.c | 2 | ||||
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 8820af14f2..405fba4a0d 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -595,7 +595,7 @@ LIBMSRPC_OBJ = $(SCHANNEL_OBJ) \ rpc_client/cli_pipe.o \ librpc/crypto/gse_krb5.o \ librpc/crypto/gse.o \ - librpc/rpc/dcerpc_spnego.o \ + librpc/crypto/cli_spnego.o \ librpc/rpc/rpc_common.o \ rpc_client/rpc_transport_np.o \ rpc_client/rpc_transport_sock.o \ diff --git a/source3/librpc/rpc/dcerpc_spnego.c b/source3/librpc/crypto/cli_spnego.c index 89baa03cf3..04a0922197 100644 --- a/source3/librpc/rpc/dcerpc_spnego.c +++ b/source3/librpc/crypto/cli_spnego.c @@ -22,7 +22,7 @@ #include "include/ntlmssp_wrap.h" #include "librpc/gen_ndr/ntlmssp.h" #include "librpc/crypto/gse.h" -#include "dcerpc_spnego.h" +#include "librpc/crypto/spnego.h" struct spnego_context { enum spnego_mech mech; @@ -367,4 +367,3 @@ DATA_BLOB spnego_get_session_key(TALLOC_CTX *mem_ctx, return data_blob_null; } } - diff --git a/source3/librpc/rpc/dcerpc_spnego.h b/source3/librpc/crypto/spnego.h index d4e7c62786..e2a00b6ef6 100644 --- a/source3/librpc/rpc/dcerpc_spnego.h +++ b/source3/librpc/crypto/spnego.h @@ -17,8 +17,8 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef _DCERPC_SPNEGO_H_ -#define _DCERPC_SPENGO_H_ +#ifndef _CLI_SPNEGO_H_ +#define _CLI_SPENGO_H_ struct spnego_context; @@ -58,4 +58,4 @@ NTSTATUS spnego_get_negotiated_mech(struct spnego_context *sp_ctx, DATA_BLOB spnego_get_session_key(TALLOC_CTX *mem_ctx, struct spnego_context *sp_ctx); -#endif /* _DCERPC_SPENGO_H_ */ +#endif /* _CLI_SPENGO_H_ */ diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c index fd51ca253e..870706bcbe 100644 --- a/source3/librpc/rpc/dcerpc_helpers.c +++ b/source3/librpc/rpc/dcerpc_helpers.c @@ -27,7 +27,7 @@ #include "../libcli/auth/ntlmssp.h" #include "ntlmssp_wrap.h" #include "librpc/crypto/gse.h" -#include "librpc/rpc/dcerpc_spnego.h" +#include "librpc/crypto/spnego.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_PARSE diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index cca4f38a8c..8538b232ec 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -30,7 +30,7 @@ #include "librpc/gen_ndr/ndr_dcerpc.h" #include "librpc/rpc/dcerpc.h" #include "librpc/crypto/gse.h" -#include "librpc/rpc/dcerpc_spnego.h" +#include "librpc/crypto/spnego.h" #include "rpc_dce.h" #undef DBGC_CLASS |