From a48f884f705de2d08250e00400ae20cd8c677033 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 8 Sep 2009 15:32:24 +0200 Subject: s3: remove unused RPC_AUTH_SCHANNEL_NEG struct and parsing functions. Guenther --- source3/include/proto.h | 4 ---- source3/include/rpc_dce.h | 10 ---------- source3/rpc_parse/parse_rpc.c | 41 ----------------------------------------- 3 files changed, 55 deletions(-) diff --git a/source3/include/proto.h b/source3/include/proto.h index 4bdd306c0b..be5cfe1141 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5731,10 +5731,6 @@ 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); -void init_rpc_auth_schannel_neg(RPC_AUTH_SCHANNEL_NEG *neg, - const char *domain, const char *myname); -bool smb_io_rpc_auth_schannel_neg(const char *desc, RPC_AUTH_SCHANNEL_NEG *neg, - 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 cd65ac8656..684880d152 100644 --- a/source3/include/rpc_dce.h +++ b/source3/include/rpc_dce.h @@ -174,16 +174,6 @@ typedef struct rpc_hdr_auth_info { #define RPC_HDR_AUTH_LEN 8 -/* this is TEMPORARILY coded up as a specific structure */ -/* this structure comes after the bind request */ -/* RPC_AUTH_SCHANNEL_NEG */ -typedef struct rpc_auth_schannel_neg_info { - uint32 type1; /* Always zero ? */ - uint32 type2; /* Types 0x3 and 0x13 seen. Check AcquireSecurityContext() docs.... */ - fstring domain; /* calling workstations's domain */ - fstring myname; /* calling workstation's name */ -} RPC_AUTH_SCHANNEL_NEG; - /* attached to the end of encrypted rpc requests and responses */ /* RPC_AUTH_SCHANNEL_CHK */ typedef struct rpc_auth_schannel_chk_info { diff --git a/source3/rpc_parse/parse_rpc.c b/source3/rpc_parse/parse_rpc.c index 651a5915b8..2e7216c3ca 100644 --- a/source3/rpc_parse/parse_rpc.c +++ b/source3/rpc_parse/parse_rpc.c @@ -570,47 +570,6 @@ bool smb_io_rpc_schannel_verifier(const char *desc, RPC_AUTH_VERIFIER *rav, prs_ return True; } -/******************************************************************* -creates an RPC_AUTH_SCHANNEL_NEG structure. -********************************************************************/ - -void init_rpc_auth_schannel_neg(RPC_AUTH_SCHANNEL_NEG *neg, - const char *domain, const char *myname) -{ - neg->type1 = 0; - neg->type2 = 0x3; - fstrcpy(neg->domain, domain); - fstrcpy(neg->myname, myname); -} - -/******************************************************************* - Reads or writes an RPC_AUTH_SCHANNEL_NEG structure. -********************************************************************/ - -bool smb_io_rpc_auth_schannel_neg(const char *desc, RPC_AUTH_SCHANNEL_NEG *neg, - prs_struct *ps, int depth) -{ - if (neg == NULL) - return False; - - prs_debug(ps, depth, desc, "smb_io_rpc_auth_schannel_neg"); - depth++; - - if(!prs_align(ps)) - return False; - - if(!prs_uint32("type1", ps, depth, &neg->type1)) - return False; - if(!prs_uint32("type2", ps, depth, &neg->type2)) - return False; - if(!prs_string("domain ", ps, depth, neg->domain, sizeof(neg->domain))) - return False; - if(!prs_string("myname ", ps, depth, neg->myname, sizeof(neg->myname))) - return False; - - return True; -} - /******************************************************************* reads or writes an RPC_AUTH_SCHANNEL_CHK structure. ********************************************************************/ -- cgit