diff options
author | Tim Potter <tpot@samba.org> | 2002-08-07 00:54:32 +0000 |
---|---|---|
committer | Tim Potter <tpot@samba.org> | 2002-08-07 00:54:32 +0000 |
commit | 142ef6e2ab1f4418bbd35ce17393d5ee60c251e3 (patch) | |
tree | cfe0c33ba321cd64d8b96ebf04ff4178e16e9a8b /packet-dcerpc-nt.c | |
parent | 7dfb10501188b2860b49cc147a7567aa5c914568 (diff) |
In dissect_doserror and dissect_ntstatus, don't add anything to the
COL_INFO field if the proto_tree parameter is NULL. This prevents
duplicate error messages when we just want to peek at the value of the
error.
svn path=/trunk/; revision=5963
Diffstat (limited to 'packet-dcerpc-nt.c')
-rw-r--r-- | packet-dcerpc-nt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-dcerpc-nt.c b/packet-dcerpc-nt.c index 556d09f19e..8dc00e56b1 100644 --- a/packet-dcerpc-nt.c +++ b/packet-dcerpc-nt.c @@ -2,7 +2,7 @@ * Routines for DCERPC over SMB packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-nt.c,v 1.41 2002/06/28 07:17:34 tpot Exp $ + * $Id: packet-dcerpc-nt.c,v 1.42 2002/08/07 00:54:32 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -937,7 +937,7 @@ dissect_ntstatus(tvbuff_t *tvb, gint offset, packet_info *pinfo, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hfindex, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (tree && status != 0 && check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(status, NT_errors, "Unknown error 0x%08x")); @@ -959,7 +959,7 @@ dissect_doserror(tvbuff_t *tvb, gint offset, packet_info *pinfo, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hfindex, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (tree && status != 0 && check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(status, DOS_errors, "Unknown error 0x%08x")); |