From a155f3f9a92d57c2fa18ef44780e85e16cb32d1f Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Fri, 11 Sep 2009 02:21:33 +0200 Subject: [PATCH] s3-schannel: remove unused code. Guenther --- source3/include/proto.h | 6 ---- source3/include/rpc_dce.h | 6 ---- source3/rpc_parse/parse_rpc.c | 63 ----------------------------------- 3 files changed, 75 deletions(-) diff --git a/source3/include/proto.h b/source3/include/proto.h index 5c584682616..9de77f9227b 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5728,12 +5728,6 @@ void init_rpc_hdr_auth(RPC_HDR_AUTH *rai, uint8 auth_pad_len, uint32 auth_context_id); bool smb_io_rpc_hdr_auth(const char *desc, RPC_HDR_AUTH *rai, prs_struct *ps, int depth); -bool rpc_auth_verifier_chk(RPC_AUTH_VERIFIER *rav, - const char *signature, uint32 msg_type); -void init_rpc_auth_verifier(RPC_AUTH_VERIFIER *rav, - const char *signature, uint32 msg_type); -bool smb_io_rpc_auth_verifier(const char *desc, RPC_AUTH_VERIFIER *rav, prs_struct *ps, int depth); -bool smb_io_rpc_schannel_verifier(const char *desc, RPC_AUTH_VERIFIER *rav, prs_struct *ps, int depth); bool smb_io_rpc_auth_schannel_chk(const char *desc, int auth_len, RPC_AUTH_SCHANNEL_CHK * chk, prs_struct *ps, int depth); diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h index 684880d152e..7992658a720 100644 --- a/source3/include/rpc_dce.h +++ b/source3/include/rpc_dce.h @@ -228,10 +228,4 @@ typedef struct rpc_hdr_ba_info { struct ndr_syntax_id transfer; /* the transfer syntax from the request */ } RPC_HDR_BA; -/* RPC_AUTH_VERIFIER */ -typedef struct rpc_auth_verif_info { - fstring signature; /* "NTLMSSP".. Ok, not quite anymore */ - uint32 msg_type; /* NTLMSSP_MESSAGE_TYPE (1,2,3) and 5 for schannel */ -} RPC_AUTH_VERIFIER; - #endif /* _DCE_RPC_H */ diff --git a/source3/rpc_parse/parse_rpc.c b/source3/rpc_parse/parse_rpc.c index 2e7216c3ca7..7b0592c20f7 100644 --- a/source3/rpc_parse/parse_rpc.c +++ b/source3/rpc_parse/parse_rpc.c @@ -507,69 +507,6 @@ bool smb_io_rpc_hdr_auth(const char *desc, RPC_HDR_AUTH *rai, prs_struct *ps, in return True; } -/******************************************************************* - Checks an RPC_AUTH_VERIFIER structure. -********************************************************************/ - -bool rpc_auth_verifier_chk(RPC_AUTH_VERIFIER *rav, - const char *signature, uint32 msg_type) -{ - return (strequal(rav->signature, signature) && rav->msg_type == msg_type); -} - -/******************************************************************* - Inits an RPC_AUTH_VERIFIER structure. -********************************************************************/ - -void init_rpc_auth_verifier(RPC_AUTH_VERIFIER *rav, - const char *signature, uint32 msg_type) -{ - fstrcpy(rav->signature, signature); /* "NTLMSSP" */ - rav->msg_type = msg_type; /* NTLMSSP_MESSAGE_TYPE */ -} - -/******************************************************************* - Reads or writes an RPC_AUTH_VERIFIER structure. -********************************************************************/ - -bool smb_io_rpc_auth_verifier(const char *desc, RPC_AUTH_VERIFIER *rav, prs_struct *ps, int depth) -{ - if (rav == NULL) - return False; - - prs_debug(ps, depth, desc, "smb_io_rpc_auth_verifier"); - depth++; - - /* "NTLMSSP" */ - if(!prs_string("signature", ps, depth, rav->signature, - sizeof(rav->signature))) - return False; - if(!prs_uint32("msg_type ", ps, depth, &rav->msg_type)) /* NTLMSSP_MESSAGE_TYPE */ - return False; - - return True; -} - -/******************************************************************* - This parses an RPC_AUTH_VERIFIER for schannel. I think -********************************************************************/ - -bool smb_io_rpc_schannel_verifier(const char *desc, RPC_AUTH_VERIFIER *rav, prs_struct *ps, int depth) -{ - if (rav == NULL) - return False; - - prs_debug(ps, depth, desc, "smb_io_rpc_schannel_verifier"); - depth++; - - if(!prs_string("signature", ps, depth, rav->signature, sizeof(rav->signature))) - return False; - if(!prs_uint32("msg_type ", ps, depth, &rav->msg_type)) - return False; - - return True; -} - /******************************************************************* reads or writes an RPC_AUTH_SCHANNEL_CHK structure. ********************************************************************/ -- 2.34.1