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-netlogon.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-netlogon.c')
| -rw-r--r-- | packet-dcerpc-netlogon.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packet-dcerpc-netlogon.c b/packet-dcerpc-netlogon.c index 765bb002f4..fd19640a9f 100644 --- a/packet-dcerpc-netlogon.c +++ b/packet-dcerpc-netlogon.c @@ -3,7 +3,7 @@ * Copyright 2001,2003 Tim Potter <tpot@samba.org> * 2002 structure and command dissectors by Ronnie Sahlberg * - * $Id: packet-dcerpc-netlogon.c,v 1.73 2003/02/07 22:44:52 guy Exp $ + * $Id: packet-dcerpc-netlogon.c,v 1.74 2003/02/08 09:41:44 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -654,11 +654,11 @@ netlogon_dissect_NETWORK_INFO(tvbuff_t *tvb, int offset, offset = netlogon_dissect_CHALLENGE(tvb, offset, pinfo, tree, drep); - offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, - hf_netlogon_nt_chal_resp, 0); + offset = dissect_ndr_counted_byte_array(tvb, offset, pinfo, tree, drep, + hf_netlogon_nt_chal_resp); - offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, - hf_netlogon_lm_chal_resp, 0); + offset = dissect_ndr_counted_byte_array(tvb, offset, pinfo, tree, drep, + hf_netlogon_lm_chal_resp); return offset; } @@ -2490,7 +2490,7 @@ netlogon_dissect_PRIV_NAME(tvbuff_t *tvb, int offset, char *drep) { offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, - hf_netlogon_privilege_name, 1); + hf_netlogon_privilege_name, 0); return offset; } |