summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-10-09 06:29:08 +0000
committerTim Potter <tpot@samba.org>2003-10-09 06:29:08 +0000
commit58153961e4dce5fe74f78bfebdf847d349369376 (patch)
treec27a5b94fb95db19b1f236b739820e9e44aebcf7
parent4003c70f8c4e1077fc05a2f6a2cc27ff1c57b547 (diff)
downloadsamba-58153961e4dce5fe74f78bfebdf847d349369376.tar.gz
samba-58153961e4dce5fe74f78bfebdf847d349369376.tar.bz2
samba-58153961e4dce5fe74f78bfebdf847d349369376.zip
Merge from 3.0:
>Remove duplicate function (now in rpc_parse/parse_prs.c) and fix a RPC debug >(I renamed the element of the structure). > >Andrew Bartlett (This used to be commit 2aaafa500780f7de0dec5632d53f3347b67fae4a)
-rw-r--r--source3/rpc_parse/parse_rpc.c24
1 files changed, 2 insertions, 22 deletions
diff --git a/source3/rpc_parse/parse_rpc.c b/source3/rpc_parse/parse_rpc.c
index 7e51f1e35b..1ea59feaed 100644
--- a/source3/rpc_parse/parse_rpc.c
+++ b/source3/rpc_parse/parse_rpc.c
@@ -285,7 +285,7 @@ static BOOL smb_io_rpc_iface(const char *desc, RPC_IFACE *ifc, prs_struct *ps, i
if (!smb_io_rpc_uuid( "uuid", &ifc->uuid, ps, depth))
return False;
- if(!prs_uint32 ( "version", ps, depth, &ifc->version))
+ if(!prs_uint32 ("version", ps, depth, &ifc->version))
return False;
return True;
@@ -1187,26 +1187,6 @@ BOOL smb_io_rpc_auth_netsec_neg(const char *desc, RPC_AUTH_NETSEC_NEG *neg,
return True;
}
-
-/*******************************************************************
-creates an RPC_AUTH_NETSEC_CHK structure.
-********************************************************************/
-BOOL init_rpc_auth_netsec_chk(RPC_AUTH_NETSEC_CHK * chk,
- const uchar sig[8],
- const uchar packet_digest[8],
- const uchar seq_num[8], const uchar confounder[8])
-{
- if (chk == NULL)
- return False;
-
- memcpy(chk->sig, sig, sizeof(chk->sig));
- memcpy(chk->packet_digest, packet_digest, sizeof(chk->packet_digest));
- memcpy(chk->seq_num, seq_num, sizeof(chk->seq_num));
- memcpy(chk->confounder, confounder, sizeof(chk->confounder));
-
- return True;
-}
-
/*******************************************************************
reads or writes an RPC_AUTH_NETSEC_CHK structure.
********************************************************************/
@@ -1222,7 +1202,7 @@ BOOL smb_io_rpc_auth_netsec_chk(const char *desc, RPC_AUTH_NETSEC_CHK * chk,
prs_uint8s(False, "sig ", ps, depth, chk->sig, sizeof(chk->sig));
prs_uint8s(False, "seq_num", ps, depth, chk->seq_num, sizeof(chk->seq_num));
prs_uint8s(False, "packet_digest", ps, depth, chk->packet_digest, sizeof(chk->packet_digest));
- prs_uint8s(False, "data8", ps, depth, chk->confounder, sizeof(chk->confounder));
+ prs_uint8s(False, "confounder", ps, depth, chk->confounder, sizeof(chk->confounder));
return True;
}