diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-02-08 09:41:44 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-02-08 09:41:44 +0000 |
| commit | 64991e3fa11ef687db3de3473e0a87fe6c165646 (patch) | |
| tree | f959b08d231e0a5c65b76a471b3731b6a924f843 /packet-dcerpc-lsa.c | |
| parent | fcea88589c12a628dcc66599a56e0da4e162d7ae (diff) | |
Have "dissect_ndr_counted_string()" add 2, not 1, to its argument, as it
adds 2 levels to the tree. Fix calls to it not to add 1 for that level.
The NT and LM challenges in a NETWORK_INFO structure are opaque arrays
of bytes, not Unicode strings; dissect them as such, adding a new
routine "dissect_ndr_counted_byte_array()" for that purpose.
Get rid of some extra colons in names - the colon is put there if a
string is appended, so putting a colon in there explicitly gives double
colons.
Decorate some higher-level tree nodes with strings.
svn path=/trunk/; revision=7107
Diffstat (limited to 'packet-dcerpc-lsa.c')
| -rw-r--r-- | packet-dcerpc-lsa.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/packet-dcerpc-lsa.c b/packet-dcerpc-lsa.c index d2286ac372..825e680bc2 100644 --- a/packet-dcerpc-lsa.c +++ b/packet-dcerpc-lsa.c @@ -3,7 +3,7 @@ * Copyright 2001,2003 Tim Potter <tpot@samba.org> * 2002 Added LSA command dissectors Ronnie Sahlberg * - * $Id: packet-dcerpc-lsa.c,v 1.71 2003/02/07 22:44:52 guy Exp $ + * $Id: packet-dcerpc-lsa.c,v 1.72 2003/02/08 09:41:43 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -230,7 +230,7 @@ lsa_dissect_pointer_STRING(tvbuff_t *tvb, int offset, } offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, - di->hf_index, 1); + di->hf_index, 0); return offset; } @@ -797,7 +797,7 @@ lsa_dissect_POLICY_ACCOUNT_DOMAIN_INFO(tvbuff_t *tvb, int offset, /* account */ offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, - hf_lsa_acct, 1); + hf_lsa_acct, 0); /* sid */ offset = dissect_ndr_nt_PSID(tvb, offset, @@ -1258,7 +1258,7 @@ lsa_dissect_LSA_TRANSLATED_NAME(tvbuff_t *tvb, int offset, /* name */ offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, - hf_lsa_name, 1); + hf_lsa_name, 0); /* index */ offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -1346,7 +1346,7 @@ lsa_dissect_LSA_TRUST_INFORMATION(tvbuff_t *tvb, int offset, /* name */ offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, - hf_lsa_name, 1); + hf_lsa_name, 0); /* sid */ offset = dissect_ndr_nt_PSID(tvb, offset, @@ -2267,7 +2267,7 @@ lsa_dissect_LSA_TRUSTED_DOMAIN(tvbuff_t *tvb, int offset, /* domain */ offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, - hf_lsa_domain, 1); + hf_lsa_domain, 0); /* sid */ offset = dissect_ndr_nt_PSID(tvb, offset, @@ -2719,7 +2719,7 @@ lsa_dissect_lsaopensecret_rqst(tvbuff_t *tvb, int offset, offset = dissect_ndr_counted_string_cb( tvb, offset, pinfo, tree, drep, hf_lsa_name, cb_str_postprocess, - GINT_TO_POINTER(CB_STR_COL_INFO | 2)); + GINT_TO_POINTER(CB_STR_COL_INFO | 1)); /* [in] ACCESS_MASK access */ offset = lsa_dissect_ACCESS_MASK(tvb, offset, |