From 0334c5b425d185635f2654e21c5fb06aff197311 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Tue, 1 Oct 2013 14:45:03 +0000 Subject: Remove check_col from generated DCE/RPC dissectors. Bug 8804 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8804). I still couldn't figure out how to generate the source, so I made the modifications to the generated dissectors "manually" (search/replace tool in VS) that would match the "PIDL source" included here. I will be sending the "PIDL source" (non dissector files) to the samba team. svn path=/trunk/; revision=52313 --- epan/dissectors/packet-dcerpc-dfs.c | 44 +++---- epan/dissectors/packet-dcerpc-dnsserver.c | 20 ++-- epan/dissectors/packet-dcerpc-dssetup.c | 22 ++-- epan/dissectors/packet-dcerpc-efs.c | 26 ++--- epan/dissectors/packet-dcerpc-eventlog.c | 48 ++++---- epan/dissectors/packet-dcerpc-frsrpc.c | 10 +- epan/dissectors/packet-dcerpc-frstrans.c | 14 +-- epan/dissectors/packet-dcerpc-initshutdown.c | 6 +- epan/dissectors/packet-dcerpc-lsa.c | 164 +++++++++++++-------------- epan/dissectors/packet-dcerpc-mapi.c | 22 ++-- epan/dissectors/packet-dcerpc-nspi.c | 14 +-- epan/dissectors/packet-dcerpc-rfr.c | 4 +- epan/dissectors/packet-dcerpc-samr.c | 136 +++++++++++----------- epan/dissectors/packet-dcerpc-srvsvc.c | 108 +++++++++--------- epan/dissectors/packet-dcerpc-winreg.c | 70 ++++++------ epan/dissectors/packet-dcerpc-wkssvc.c | 62 +++++----- epan/dissectors/pidl/frsrpc.cnf | 2 +- epan/dissectors/pidl/mapi/request.cnf.c | 4 +- epan/dissectors/pidl/mapi/response.cnf.c | 4 +- tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 8 +- 20 files changed, 391 insertions(+), 397 deletions(-) diff --git a/epan/dissectors/packet-dcerpc-dfs.c b/epan/dissectors/packet-dcerpc-dfs.c index ee0f5dedac..6058b6a452 100644 --- a/epan/dissectors/packet-dcerpc-dfs.c +++ b/epan/dissectors/packet-dcerpc-dfs.c @@ -3354,7 +3354,7 @@ netdfs_dissect_dfs_Add_response(tvbuff_t *tvb _U_, int offset _U_, packet_info * pinfo->dcerpc_procedure_name="dfs_Add"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3448,7 +3448,7 @@ netdfs_dissect_dfs_Remove_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf pinfo->dcerpc_procedure_name="dfs_Remove"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3556,7 +3556,7 @@ netdfs_dissect_dfs_SetInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet_in pinfo->dcerpc_procedure_name="dfs_SetInfo"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3671,7 +3671,7 @@ netdfs_dissect_dfs_GetInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet_in offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3761,7 +3761,7 @@ netdfs_dissect_dfs_Enum_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3794,7 +3794,7 @@ netdfs_dissect_dfs_Rename_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf pinfo->dcerpc_procedure_name="dfs_Rename"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3819,7 +3819,7 @@ netdfs_dissect_dfs_Move_response(tvbuff_t *tvb _U_, int offset _U_, packet_info pinfo->dcerpc_procedure_name="dfs_Move"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3844,7 +3844,7 @@ netdfs_dissect_dfs_ManagerGetConfigInfo_response(tvbuff_t *tvb _U_, int offset _ pinfo->dcerpc_procedure_name="dfs_ManagerGetConfigInfo"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3869,7 +3869,7 @@ netdfs_dissect_dfs_ManagerSendSiteInfo_response(tvbuff_t *tvb _U_, int offset _U pinfo->dcerpc_procedure_name="dfs_ManagerSendSiteInfo"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -4011,7 +4011,7 @@ netdfs_dissect_dfs_AddFtRoot_response(tvbuff_t *tvb _U_, int offset _U_, packet_ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -4138,7 +4138,7 @@ netdfs_dissect_dfs_RemoveFtRoot_response(tvbuff_t *tvb _U_, int offset _U_, pack offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -4219,7 +4219,7 @@ netdfs_dissect_dfs_AddStdRoot_response(tvbuff_t *tvb _U_, int offset _U_, packet pinfo->dcerpc_procedure_name="dfs_AddStdRoot"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -4284,7 +4284,7 @@ netdfs_dissect_dfs_RemoveStdRoot_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="dfs_RemoveStdRoot"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -4343,7 +4343,7 @@ netdfs_dissect_dfs_ManagerInitialize_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="dfs_ManagerInitialize"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -4419,7 +4419,7 @@ netdfs_dissect_dfs_AddStdRootForced_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="dfs_AddStdRootForced"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -4452,7 +4452,7 @@ netdfs_dissect_dfs_GetDcAddress_response(tvbuff_t *tvb _U_, int offset _U_, pack pinfo->dcerpc_procedure_name="dfs_GetDcAddress"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -4477,7 +4477,7 @@ netdfs_dissect_dfs_SetDcAddress_response(tvbuff_t *tvb _U_, int offset _U_, pack pinfo->dcerpc_procedure_name="dfs_SetDcAddress"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -4525,7 +4525,7 @@ netdfs_dissect_dfs_FlushFtTable_response(tvbuff_t *tvb _U_, int offset _U_, pack pinfo->dcerpc_procedure_name="dfs_FlushFtTable"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -4554,7 +4554,7 @@ netdfs_dissect_dfs_Add2_response(tvbuff_t *tvb _U_, int offset _U_, packet_info pinfo->dcerpc_procedure_name="dfs_Add2"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -4579,7 +4579,7 @@ netdfs_dissect_dfs_Remove2_response(tvbuff_t *tvb _U_, int offset _U_, packet_in pinfo->dcerpc_procedure_name="dfs_Remove2"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -4673,7 +4673,7 @@ netdfs_dissect_dfs_EnumEx_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -4708,7 +4708,7 @@ netdfs_dissect_dfs_SetInfo2_response(tvbuff_t *tvb _U_, int offset _U_, packet_i pinfo->dcerpc_procedure_name="dfs_SetInfo2"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-dnsserver.c b/epan/dissectors/packet-dcerpc-dnsserver.c index ddadf3c9da..e87d8056b1 100644 --- a/epan/dissectors/packet-dcerpc-dnsserver.c +++ b/epan/dissectors/packet-dcerpc-dnsserver.c @@ -2661,7 +2661,7 @@ dnsserver_dissect_DnssrvOperation_response(tvbuff_t *tvb _U_, int offset _U_, pa pinfo->dcerpc_procedure_name="DnssrvOperation"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_dnsserver_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -2686,7 +2686,7 @@ dnsserver_dissect_DnssrvQuery_response(tvbuff_t *tvb _U_, int offset _U_, packet pinfo->dcerpc_procedure_name="DnssrvQuery"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_dnsserver_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -2711,7 +2711,7 @@ dnsserver_dissect_DnssrvComplexOperation_response(tvbuff_t *tvb _U_, int offset pinfo->dcerpc_procedure_name="DnssrvComplexOperation"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_dnsserver_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -2736,7 +2736,7 @@ dnsserver_dissect_DnssrvEnumRecords_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="DnssrvEnumRecords"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_dnsserver_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -2761,7 +2761,7 @@ dnsserver_dissect_DnssrvUpdateRecord_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="DnssrvUpdateRecord"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_dnsserver_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -2786,7 +2786,7 @@ dnsserver_dissect_DnssrvOperation2_response(tvbuff_t *tvb _U_, int offset _U_, p pinfo->dcerpc_procedure_name="DnssrvOperation2"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_dnsserver_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -2928,7 +2928,7 @@ dnsserver_dissect_DnssrvQuery2_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_dnsserver_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -2963,7 +2963,7 @@ dnsserver_dissect_DnssrvComplexOperation2_response(tvbuff_t *tvb _U_, int offset pinfo->dcerpc_procedure_name="DnssrvComplexOperation2"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_dnsserver_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -3200,7 +3200,7 @@ dnsserver_dissect_DnssrvEnumRecords2_response(tvbuff_t *tvb _U_, int offset _U_, offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_dnsserver_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -3245,7 +3245,7 @@ dnsserver_dissect_DnssrvUpdateRecord2_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="DnssrvUpdateRecord2"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_dnsserver_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-dssetup.c b/epan/dissectors/packet-dcerpc-dssetup.c index db21703d9d..456930fd2a 100644 --- a/epan/dissectors/packet-dcerpc-dssetup.c +++ b/epan/dissectors/packet-dcerpc-dssetup.c @@ -573,7 +573,7 @@ dssetup_dissect_DsRoleGetPrimaryDomainInformation_response(tvbuff_t *tvb _U_, in offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_dssetup_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, DOS_errors, "Unknown DOS error 0x%08x")); return offset; @@ -598,7 +598,7 @@ dssetup_dissect_DsRoleDnsNameToFlatName_response(tvbuff_t *tvb _U_, int offset _ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_dssetup_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, DOS_errors, "Unknown DOS error 0x%08x")); return offset; @@ -621,7 +621,7 @@ dssetup_dissect_DsRoleDcAsDc_response(tvbuff_t *tvb _U_, int offset _U_, packet_ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_dssetup_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, DOS_errors, "Unknown DOS error 0x%08x")); return offset; @@ -644,7 +644,7 @@ dssetup_dissect_DsRoleDcAsReplica_response(tvbuff_t *tvb _U_, int offset _U_, pa offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_dssetup_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, DOS_errors, "Unknown DOS error 0x%08x")); return offset; @@ -667,7 +667,7 @@ dssetup_dissect_DsRoleDemoteDc_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_dssetup_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, DOS_errors, "Unknown DOS error 0x%08x")); return offset; @@ -690,7 +690,7 @@ dssetup_dissect_DsRoleGetDcOperationProgress_response(tvbuff_t *tvb _U_, int off offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_dssetup_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, DOS_errors, "Unknown DOS error 0x%08x")); return offset; @@ -713,7 +713,7 @@ dssetup_dissect_DsRoleGetDcOperationResults_response(tvbuff_t *tvb _U_, int offs offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_dssetup_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, DOS_errors, "Unknown DOS error 0x%08x")); return offset; @@ -736,7 +736,7 @@ dssetup_dissect_DsRoleCancel_response(tvbuff_t *tvb _U_, int offset _U_, packet_ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_dssetup_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, DOS_errors, "Unknown DOS error 0x%08x")); return offset; @@ -759,7 +759,7 @@ dssetup_dissect_DsRoleServerSaveStateForUpgrade_response(tvbuff_t *tvb _U_, int offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_dssetup_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, DOS_errors, "Unknown DOS error 0x%08x")); return offset; @@ -782,7 +782,7 @@ dssetup_dissect_DsRoleUpgradeDownlevelServer_response(tvbuff_t *tvb _U_, int off offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_dssetup_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, DOS_errors, "Unknown DOS error 0x%08x")); return offset; @@ -805,7 +805,7 @@ dssetup_dissect_DsRoleAbortDownlevelServerUpgrade_response(tvbuff_t *tvb _U_, in offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_dssetup_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, DOS_errors, "Unknown DOS error 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-efs.c b/epan/dissectors/packet-dcerpc-efs.c index 9f24c2dbd8..c48f667c96 100644 --- a/epan/dissectors/packet-dcerpc-efs.c +++ b/epan/dissectors/packet-dcerpc-efs.c @@ -571,7 +571,7 @@ efs_dissect_EfsRpcOpenFileRaw_response(tvbuff_t *tvb _U_, int offset _U_, packet offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_efs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -616,7 +616,7 @@ efs_dissect_EfsRpcReadFileRaw_response(tvbuff_t *tvb _U_, int offset _U_, packet pinfo->dcerpc_procedure_name="EfsRpcReadFileRaw"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_efs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -659,7 +659,7 @@ efs_dissect_EfsRpcWriteFileRaw_response(tvbuff_t *tvb _U_, int offset _U_, packe pinfo->dcerpc_procedure_name="EfsRpcWriteFileRaw"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_efs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -736,7 +736,7 @@ efs_dissect_EfsRpcEncryptFileSrv_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="EfsRpcEncryptFileSrv"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_efs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -783,7 +783,7 @@ efs_dissect_EfsRpcDecryptFileSrv_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="EfsRpcDecryptFileSrv"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_efs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -851,7 +851,7 @@ efs_dissect_EfsRpcQueryUsersOnFile_response(tvbuff_t *tvb _U_, int offset _U_, p offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_efs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -917,7 +917,7 @@ efs_dissect_EfsRpcQueryRecoveryAgents_response(tvbuff_t *tvb _U_, int offset _U_ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_efs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -955,7 +955,7 @@ efs_dissect_EfsRpcRemoveUsersFromFile_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="EfsRpcRemoveUsersFromFile"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_efs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -993,7 +993,7 @@ efs_dissect_EfsRpcAddUsersToFile_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="EfsRpcAddUsersToFile"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_efs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1036,7 +1036,7 @@ efs_dissect_EfsRpcSetFileEncryptionKey_response(tvbuff_t *tvb _U_, int offset _U pinfo->dcerpc_procedure_name="EfsRpcSetFileEncryptionKey"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_efs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1063,7 +1063,7 @@ efs_dissect_EfsRpcNotSupported_response(tvbuff_t *tvb _U_, int offset _U_, packe pinfo->dcerpc_procedure_name="EfsRpcNotSupported"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_efs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1088,7 +1088,7 @@ efs_dissect_EfsRpcFileKeyInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet pinfo->dcerpc_procedure_name="EfsRpcFileKeyInfo"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_efs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1113,7 +1113,7 @@ efs_dissect_EfsRpcDuplicateEncryptionInfoFile_response(tvbuff_t *tvb _U_, int of pinfo->dcerpc_procedure_name="EfsRpcDuplicateEncryptionInfoFile"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_efs_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-eventlog.c b/epan/dissectors/packet-dcerpc-eventlog.c index 8f36ec482c..9cd5bf40e7 100644 --- a/epan/dissectors/packet-dcerpc-eventlog.c +++ b/epan/dissectors/packet-dcerpc-eventlog.c @@ -905,7 +905,7 @@ eventlog_dissect_ClearEventLogW_response(tvbuff_t *tvb _U_, int offset _U_, pack pinfo->dcerpc_procedure_name="ClearEventLogW"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -967,7 +967,7 @@ eventlog_dissect_BackupEventLogW_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="BackupEventLogW"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1015,7 +1015,7 @@ eventlog_dissect_CloseEventLog_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1061,7 +1061,7 @@ eventlog_dissect_DeregisterEventSource_response(tvbuff_t *tvb _U_, int offset _U offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1124,7 +1124,7 @@ eventlog_dissect_GetNumRecords_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1187,7 +1187,7 @@ eventlog_dissect_GetOldestRecord_response(tvbuff_t *tvb _U_, int offset _U_, pac offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1256,7 +1256,7 @@ eventlog_dissect_ChangeNotify_response(tvbuff_t *tvb _U_, int offset _U_, packet pinfo->dcerpc_procedure_name="ChangeNotify"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1359,7 +1359,7 @@ eventlog_dissect_OpenEventLogW_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1466,7 +1466,7 @@ eventlog_dissect_RegisterEventSourceW_response(tvbuff_t *tvb _U_, int offset _U_ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1564,7 +1564,7 @@ eventlog_dissect_OpenBackupEventLogW_response(tvbuff_t *tvb _U_, int offset _U_, offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1700,7 +1700,7 @@ eventlog_dissect_ReadEventLogW_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1812,7 +1812,7 @@ eventlog_dissect_ReportEventW_response(tvbuff_t *tvb _U_, int offset _U_, packet pinfo->dcerpc_procedure_name="ReportEventW"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1853,7 +1853,7 @@ eventlog_dissect_ClearEventLogA_response(tvbuff_t *tvb _U_, int offset _U_, pack pinfo->dcerpc_procedure_name="ClearEventLogA"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1878,7 +1878,7 @@ eventlog_dissect_BackupEventLogA_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="BackupEventLogA"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1903,7 +1903,7 @@ eventlog_dissect_OpenEventLogA_response(tvbuff_t *tvb _U_, int offset _U_, packe pinfo->dcerpc_procedure_name="OpenEventLogA"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1928,7 +1928,7 @@ eventlog_dissect_RegisterEventSourceA_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="RegisterEventSourceA"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1953,7 +1953,7 @@ eventlog_dissect_OpenBackupEventLogA_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="OpenBackupEventLogA"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -1978,7 +1978,7 @@ eventlog_dissect_ReadEventLogA_response(tvbuff_t *tvb _U_, int offset _U_, packe pinfo->dcerpc_procedure_name="ReadEventLogA"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -2003,7 +2003,7 @@ eventlog_dissect_ReportEventA_response(tvbuff_t *tvb _U_, int offset _U_, packet pinfo->dcerpc_procedure_name="ReportEventA"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -2028,7 +2028,7 @@ eventlog_dissect_RegisterClusterSvc_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="RegisterClusterSvc"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -2053,7 +2053,7 @@ eventlog_dissect_DeregisterClusterSvc_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="DeregisterClusterSvc"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -2078,7 +2078,7 @@ eventlog_dissect_WriteClusterEvents_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="WriteClusterEvents"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -2177,7 +2177,7 @@ eventlog_dissect_GetLogIntormation_response(tvbuff_t *tvb _U_, int offset _U_, p offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -2224,7 +2224,7 @@ eventlog_dissect_FlushEventLog_response(tvbuff_t *tvb _U_, int offset _U_, packe pinfo->dcerpc_procedure_name="FlushEventLog"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_eventlog_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-frsrpc.c b/epan/dissectors/packet-dcerpc-frsrpc.c index e85dca2e53..fa4ab736bd 100644 --- a/epan/dissectors/packet-dcerpc-frsrpc.c +++ b/epan/dissectors/packet-dcerpc-frsrpc.c @@ -705,7 +705,7 @@ frsrpc_dissect_enum_CommPktCommand(tvbuff_t *tvb _U_, int offset _U_, packet_inf s = frsrpc_frsrpc_CommPktCommand_vals[i].strptr; } } - if (s!= NULL && check_col(pinfo->cinfo, COL_INFO)) + if (s!= NULL) col_append_fstr(pinfo->cinfo, COL_INFO, ",command = %s", s); if(param){ @@ -3087,7 +3087,7 @@ frsrpc_dissect_FrsSendCommPkt_response(tvbuff_t *tvb _U_, int offset _U_, packet pinfo->dcerpc_procedure_name="FrsSendCommPkt"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frsrpc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3211,7 +3211,7 @@ frsrpc_dissect_FrsVerifyPromotionParent_response(tvbuff_t *tvb _U_, int offset _ pinfo->dcerpc_procedure_name="FrsVerifyPromotionParent"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frsrpc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3513,7 +3513,7 @@ frsrpc_dissect_FrsStartPromotionParent_response(tvbuff_t *tvb _U_, int offset _U offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frsrpc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3562,7 +3562,7 @@ frsrpc_dissect_FrsNOP_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *p pinfo->dcerpc_procedure_name="FrsNOP"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frsrpc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-frstrans.c b/epan/dissectors/packet-dcerpc-frstrans.c index de8e08c7a1..0c693f05e5 100644 --- a/epan/dissectors/packet-dcerpc-frstrans.c +++ b/epan/dissectors/packet-dcerpc-frstrans.c @@ -1584,7 +1584,7 @@ frstrans_dissect_CheckConnectivity_response(tvbuff_t *tvb _U_, int offset _U_, p pinfo->dcerpc_procedure_name="CheckConnectivity"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frstrans_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1688,7 +1688,7 @@ frstrans_dissect_EstablishConnection_response(tvbuff_t *tvb _U_, int offset _U_, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frstrans_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1738,7 +1738,7 @@ frstrans_dissect_EstablishSession_response(tvbuff_t *tvb _U_, int offset _U_, pa pinfo->dcerpc_procedure_name="EstablishSession"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frstrans_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1953,7 +1953,7 @@ frstrans_dissect_RequestUpdates_response(tvbuff_t *tvb _U_, int offset _U_, pack offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frstrans_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2045,7 +2045,7 @@ frstrans_dissect_RequestVersionVector_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="RequestVersionVector"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frstrans_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2110,7 +2110,7 @@ frstrans_dissect_AsyncPoll_response(tvbuff_t *tvb _U_, int offset _U_, packet_in offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frstrans_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2445,7 +2445,7 @@ frstrans_dissect_InitializeFileTransferAsync_response(tvbuff_t *tvb _U_, int off offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frstrans_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-initshutdown.c b/epan/dissectors/packet-dcerpc-initshutdown.c index dec43daf42..4551fb2a26 100644 --- a/epan/dissectors/packet-dcerpc-initshutdown.c +++ b/epan/dissectors/packet-dcerpc-initshutdown.c @@ -276,7 +276,7 @@ initshutdown_dissect_Init_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf pinfo->dcerpc_procedure_name="Init"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_initshutdown_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -327,7 +327,7 @@ initshutdown_dissect_Abort_response(tvbuff_t *tvb _U_, int offset _U_, packet_in pinfo->dcerpc_procedure_name="Abort"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_initshutdown_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -423,7 +423,7 @@ initshutdown_dissect_InitEx_response(tvbuff_t *tvb _U_, int offset _U_, packet_i pinfo->dcerpc_procedure_name="InitEx"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_initshutdown_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c index 8f75f84622..cdc1b3c16d 100644 --- a/epan/dissectors/packet-dcerpc-lsa.c +++ b/epan/dissectors/packet-dcerpc-lsa.c @@ -6630,7 +6630,7 @@ lsarpc_dissect_lsa_Close_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -6673,7 +6673,7 @@ lsarpc_dissect_lsa_Delete_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf pinfo->dcerpc_procedure_name="lsa_Delete"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -6765,7 +6765,7 @@ lsarpc_dissect_lsa_EnumPrivs_response(tvbuff_t *tvb _U_, int offset _U_, packet_ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -6841,7 +6841,7 @@ lsarpc_dissect_lsa_QuerySecurity_response(tvbuff_t *tvb _U_, int offset _U_, pac offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -6870,7 +6870,7 @@ lsarpc_dissect_lsa_SetSecObj_response(tvbuff_t *tvb _U_, int offset _U_, packet_ pinfo->dcerpc_procedure_name="lsa_SetSecObj"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -6895,7 +6895,7 @@ lsarpc_dissect_lsa_ChangePassword_response(tvbuff_t *tvb _U_, int offset _U_, pa pinfo->dcerpc_procedure_name="lsa_ChangePassword"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -6982,7 +6982,7 @@ lsarpc_dissect_lsa_OpenPolicy_response(tvbuff_t *tvb _U_, int offset _U_, packet offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -7058,7 +7058,7 @@ lsarpc_dissect_lsa_QueryInfoPolicy_response(tvbuff_t *tvb _U_, int offset _U_, p offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -7129,7 +7129,7 @@ lsarpc_dissect_lsa_SetInfoPolicy_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="lsa_SetInfoPolicy"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -7160,7 +7160,7 @@ lsarpc_dissect_lsa_ClearAuditLog_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="lsa_ClearAuditLog"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -7247,7 +7247,7 @@ lsarpc_dissect_lsa_CreateAccount_response(tvbuff_t *tvb _U_, int offset _U_, pac offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -7343,7 +7343,7 @@ lsarpc_dissect_lsa_EnumAccounts_response(tvbuff_t *tvb _U_, int offset _U_, pack offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -7436,7 +7436,7 @@ lsarpc_dissect_lsa_CreateTrustedDomain_response(tvbuff_t *tvb _U_, int offset _U offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -7532,7 +7532,7 @@ lsarpc_dissect_lsa_EnumTrustDom_response(tvbuff_t *tvb _U_, int offset _U_, pack offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -7666,7 +7666,7 @@ lsarpc_dissect_lsa_LookupNames_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -7805,7 +7805,7 @@ lsarpc_dissect_lsa_LookupSids_response(tvbuff_t *tvb _U_, int offset _U_, packet offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -7894,7 +7894,7 @@ lsarpc_dissect_lsa_CreateSecret_response(tvbuff_t *tvb _U_, int offset _U_, pack offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -7987,7 +7987,7 @@ lsarpc_dissect_lsa_OpenAccount_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8054,7 +8054,7 @@ lsarpc_dissect_lsa_EnumPrivsAccount_response(tvbuff_t *tvb _U_, int offset _U_, offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8114,7 +8114,7 @@ lsarpc_dissect_lsa_AddPrivilegesToAccount_response(tvbuff_t *tvb _U_, int offset pinfo->dcerpc_procedure_name="lsa_AddPrivilegesToAccount"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8185,7 +8185,7 @@ lsarpc_dissect_lsa_RemovePrivilegesFromAccount_response(tvbuff_t *tvb _U_, int o pinfo->dcerpc_procedure_name="lsa_RemovePrivilegesFromAccount"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8216,7 +8216,7 @@ lsarpc_dissect_lsa_GetQuotasForAccount_response(tvbuff_t *tvb _U_, int offset _U pinfo->dcerpc_procedure_name="lsa_GetQuotasForAccount"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8241,7 +8241,7 @@ lsarpc_dissect_lsa_SetQuotasForAccount_response(tvbuff_t *tvb _U_, int offset _U pinfo->dcerpc_procedure_name="lsa_SetQuotasForAccount"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8266,7 +8266,7 @@ lsarpc_dissect_lsa_GetSystemAccessAccount_response(tvbuff_t *tvb _U_, int offset pinfo->dcerpc_procedure_name="lsa_GetSystemAccessAccount"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8291,7 +8291,7 @@ lsarpc_dissect_lsa_SetSystemAccessAccount_response(tvbuff_t *tvb _U_, int offset pinfo->dcerpc_procedure_name="lsa_SetSystemAccessAccount"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8378,7 +8378,7 @@ lsarpc_dissect_lsa_OpenTrustedDomain_response(tvbuff_t *tvb _U_, int offset _U_, offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8454,7 +8454,7 @@ lsarpc_dissect_lsa_QueryTrustedDomainInfo_response(tvbuff_t *tvb _U_, int offset offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8483,7 +8483,7 @@ lsarpc_dissect_lsa_SetInformationTrustedDomain_response(tvbuff_t *tvb _U_, int o pinfo->dcerpc_procedure_name="lsa_SetInformationTrustedDomain"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8562,7 +8562,7 @@ lsarpc_dissect_lsa_OpenSecret_response(tvbuff_t *tvb _U_, int offset _U_, packet offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8643,7 +8643,7 @@ lsarpc_dissect_lsa_SetSecret_response(tvbuff_t *tvb _U_, int offset _U_, packet_ pinfo->dcerpc_procedure_name="lsa_SetSecret"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8770,7 +8770,7 @@ lsarpc_dissect_lsa_QuerySecret_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8858,7 +8858,7 @@ lsarpc_dissect_lsa_LookupPrivValue_response(tvbuff_t *tvb _U_, int offset _U_, p offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -8940,7 +8940,7 @@ lsarpc_dissect_lsa_LookupPrivName_response(tvbuff_t *tvb _U_, int offset _U_, pa offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9051,7 +9051,7 @@ lsarpc_dissect_lsa_LookupPrivDisplayName_response(tvbuff_t *tvb _U_, int offset offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9084,7 +9084,7 @@ lsarpc_dissect_lsa_DeleteObject_response(tvbuff_t *tvb _U_, int offset _U_, pack pinfo->dcerpc_procedure_name="lsa_DeleteObject"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9162,7 +9162,7 @@ lsarpc_dissect_lsa_EnumAccountsWithUserRight_response(tvbuff_t *tvb _U_, int off offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9244,7 +9244,7 @@ lsarpc_dissect_lsa_EnumAccountRights_response(tvbuff_t *tvb _U_, int offset _U_, offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9323,7 +9323,7 @@ lsarpc_dissect_lsa_AddAccountRights_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="lsa_AddAccountRights"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9413,7 +9413,7 @@ lsarpc_dissect_lsa_RemoveAccountRights_response(tvbuff_t *tvb _U_, int offset _U pinfo->dcerpc_procedure_name="lsa_RemoveAccountRights"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9508,7 +9508,7 @@ lsarpc_dissect_lsa_QueryTrustedDomainInfoBySid_response(tvbuff_t *tvb _U_, int o offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9539,7 +9539,7 @@ lsarpc_dissect_lsa_SetTrustedDomainInfo_response(tvbuff_t *tvb _U_, int offset _ pinfo->dcerpc_procedure_name="lsa_SetTrustedDomainInfo"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9597,7 +9597,7 @@ lsarpc_dissect_lsa_DeleteTrustedDomain_response(tvbuff_t *tvb _U_, int offset _U pinfo->dcerpc_procedure_name="lsa_DeleteTrustedDomain"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9626,7 +9626,7 @@ lsarpc_dissect_lsa_StorePrivateData_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="lsa_StorePrivateData"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9651,7 +9651,7 @@ lsarpc_dissect_lsa_RetrievePrivateData_response(tvbuff_t *tvb _U_, int offset _U pinfo->dcerpc_procedure_name="lsa_RetrievePrivateData"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9741,7 +9741,7 @@ lsarpc_dissect_lsa_OpenPolicy2_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9831,7 +9831,7 @@ lsarpc_dissect_lsa_GetUserName_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9907,7 +9907,7 @@ lsarpc_dissect_lsa_QueryInfoPolicy2_response(tvbuff_t *tvb _U_, int offset _U_, offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9978,7 +9978,7 @@ lsarpc_dissect_lsa_SetInfoPolicy2_response(tvbuff_t *tvb _U_, int offset _U_, pa pinfo->dcerpc_procedure_name="lsa_SetInfoPolicy2"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10063,7 +10063,7 @@ lsarpc_dissect_lsa_QueryTrustedDomainInfoByName_response(tvbuff_t *tvb _U_, int offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10145,7 +10145,7 @@ lsarpc_dissect_lsa_SetTrustedDomainInfoByName_response(tvbuff_t *tvb _U_, int of pinfo->dcerpc_procedure_name="lsa_SetTrustedDomainInfoByName"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10243,7 +10243,7 @@ lsarpc_dissect_lsa_EnumTrustedDomainsEx_response(tvbuff_t *tvb _U_, int offset _ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10274,7 +10274,7 @@ lsarpc_dissect_lsa_CreateTrustedDomainEx_response(tvbuff_t *tvb _U_, int offset pinfo->dcerpc_procedure_name="lsa_CreateTrustedDomainEx"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10318,7 +10318,7 @@ lsarpc_dissect_lsa_CloseTrustedDomainEx_response(tvbuff_t *tvb _U_, int offset _ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10390,7 +10390,7 @@ lsarpc_dissect_lsa_QueryDomainInformationPolicy_response(tvbuff_t *tvb _U_, int offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10461,7 +10461,7 @@ lsarpc_dissect_lsa_SetDomainInformationPolicy_response(tvbuff_t *tvb _U_, int of pinfo->dcerpc_procedure_name="lsa_SetDomainInformationPolicy"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10546,7 +10546,7 @@ lsarpc_dissect_lsa_OpenTrustedDomainByName_response(tvbuff_t *tvb _U_, int offse offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10577,7 +10577,7 @@ lsarpc_dissect_lsa_TestCall_response(tvbuff_t *tvb _U_, int offset _U_, packet_i pinfo->dcerpc_procedure_name="lsa_TestCall"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10722,7 +10722,7 @@ lsarpc_dissect_lsa_LookupSids2_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10882,7 +10882,7 @@ lsarpc_dissect_lsa_LookupNames2_response(tvbuff_t *tvb _U_, int offset _U_, pack offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10923,7 +10923,7 @@ lsarpc_dissect_lsa_CreateTrustedDomainEx2_response(tvbuff_t *tvb _U_, int offset pinfo->dcerpc_procedure_name="lsa_CreateTrustedDomainEx2"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10948,7 +10948,7 @@ lsarpc_dissect_lsa_CREDRWRITE_response(tvbuff_t *tvb _U_, int offset _U_, packet pinfo->dcerpc_procedure_name="lsa_CREDRWRITE"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10973,7 +10973,7 @@ lsarpc_dissect_lsa_CREDRREAD_response(tvbuff_t *tvb _U_, int offset _U_, packet_ pinfo->dcerpc_procedure_name="lsa_CREDRREAD"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10998,7 +10998,7 @@ lsarpc_dissect_lsa_CREDRENUMERATE_response(tvbuff_t *tvb _U_, int offset _U_, pa pinfo->dcerpc_procedure_name="lsa_CREDRENUMERATE"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11023,7 +11023,7 @@ lsarpc_dissect_lsa_CREDRWRITEDOMAINCREDENTIALS_response(tvbuff_t *tvb _U_, int o pinfo->dcerpc_procedure_name="lsa_CREDRWRITEDOMAINCREDENTIALS"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11048,7 +11048,7 @@ lsarpc_dissect_lsa_CREDRREADDOMAINCREDENTIALS_response(tvbuff_t *tvb _U_, int of pinfo->dcerpc_procedure_name="lsa_CREDRREADDOMAINCREDENTIALS"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11073,7 +11073,7 @@ lsarpc_dissect_lsa_CREDRDELETE_response(tvbuff_t *tvb _U_, int offset _U_, packe pinfo->dcerpc_procedure_name="lsa_CREDRDELETE"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11098,7 +11098,7 @@ lsarpc_dissect_lsa_CREDRGETTARGETINFO_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="lsa_CREDRGETTARGETINFO"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11123,7 +11123,7 @@ lsarpc_dissect_lsa_CREDRPROFILELOADED_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="lsa_CREDRPROFILELOADED"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11269,7 +11269,7 @@ lsarpc_dissect_lsa_LookupNames3_response(tvbuff_t *tvb _U_, int offset _U_, pack offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11310,7 +11310,7 @@ lsarpc_dissect_lsa_CREDRGETSESSIONTYPES_response(tvbuff_t *tvb _U_, int offset _ pinfo->dcerpc_procedure_name="lsa_CREDRGETSESSIONTYPES"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11335,7 +11335,7 @@ lsarpc_dissect_lsa_LSARREGISTERAUDITEVENT_response(tvbuff_t *tvb _U_, int offset pinfo->dcerpc_procedure_name="lsa_LSARREGISTERAUDITEVENT"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11360,7 +11360,7 @@ lsarpc_dissect_lsa_LSARGENAUDITEVENT_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="lsa_LSARGENAUDITEVENT"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11385,7 +11385,7 @@ lsarpc_dissect_lsa_LSARUNREGISTERAUDITEVENT_response(tvbuff_t *tvb _U_, int offs pinfo->dcerpc_procedure_name="lsa_LSARUNREGISTERAUDITEVENT"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11480,7 +11480,7 @@ lsarpc_dissect_lsa_lsaRQueryForestTrustInformation_response(tvbuff_t *tvb _U_, i offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11511,7 +11511,7 @@ lsarpc_dissect_lsa_LSARSETFORESTTRUSTINFORMATION_response(tvbuff_t *tvb _U_, int pinfo->dcerpc_procedure_name="lsa_LSARSETFORESTTRUSTINFORMATION"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11536,7 +11536,7 @@ lsarpc_dissect_lsa_CREDRRENAME_response(tvbuff_t *tvb _U_, int offset _U_, packe pinfo->dcerpc_procedure_name="lsa_CREDRRENAME"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11664,7 +11664,7 @@ lsarpc_dissect_lsa_LookupSids3_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11805,7 +11805,7 @@ lsarpc_dissect_lsa_LookupNames4_response(tvbuff_t *tvb _U_, int offset _U_, pack offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11844,7 +11844,7 @@ lsarpc_dissect_lsa_LSAROPENPOLICYSCE_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="lsa_LSAROPENPOLICYSCE"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11869,7 +11869,7 @@ lsarpc_dissect_lsa_LSARADTREGISTERSECURITYEVENTSOURCE_response(tvbuff_t *tvb _U_ pinfo->dcerpc_procedure_name="lsa_LSARADTREGISTERSECURITYEVENTSOURCE"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11894,7 +11894,7 @@ lsarpc_dissect_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE_response(tvbuff_t *tvb _ pinfo->dcerpc_procedure_name="lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11919,7 +11919,7 @@ lsarpc_dissect_lsa_LSARADTREPORTSECURITYEVENT_response(tvbuff_t *tvb _U_, int of pinfo->dcerpc_procedure_name="lsa_LSARADTREPORTSECURITYEVENT"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_lsarpc_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c index 18f3c80aa8..89a52b9de1 100644 --- a/epan/dissectors/packet-dcerpc-mapi.c +++ b/epan/dissectors/packet-dcerpc-mapi.c @@ -4001,10 +4001,9 @@ mapi_dissect_struct_EcDoRpc_MAPI_REQ(tvbuff_t *tvb _U_, int offset _U_, packet_i opnum = tvb_get_guint8(tvb, offset); offset += 1; proto_tree_add_text(tree, tvb, cur_offset, offset - cur_offset, "opnum: %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation")); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " + %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation")); - } - cur_offset = offset; + col_append_fstr(pinfo->cinfo, COL_INFO, " + %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation")); + + cur_offset = offset; mapi_flags = tvb_get_guint8(tvb, offset); offset += 1; proto_tree_add_text(tree, tvb, cur_offset, offset - cur_offset, "mapi_flags: 0x%x", mapi_flags); @@ -4238,9 +4237,8 @@ mapi_dissect_struct_EcDoRpc_MAPI_REPL(tvbuff_t *tvb _U_, int offset _U_, packet_ opnum = tvb_get_guint8(tvb, offset); offset += 1; proto_tree_add_text(tree, tvb, cur_offset, offset - cur_offset, "opnum: %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation: 0x%02x")); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " + %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation: 0x%02x")); - } + col_append_fstr(pinfo->cinfo, COL_INFO, " + %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation: 0x%02x")); + if (opnum != op_MAPI_Notify) { cur_offset = offset; handle_idx = tvb_get_guint8(tvb, offset); @@ -9647,7 +9645,7 @@ mapi_dissect_EcDoConnect_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_deferred_pointers(pinfo, tvb, offset, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_mapi_MAPISTATUS_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Status: %s", val_to_str(status, mapi_MAPISTATUS_vals, "Unknown MAPISTATUS error 0x%08x")); return offset; @@ -9706,7 +9704,7 @@ mapi_dissect_EcDoDisconnect_response(tvbuff_t *tvb _U_, int offset _U_, packet_i offset = dissect_deferred_pointers(pinfo, tvb, offset, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_mapi_MAPISTATUS_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Status: %s", val_to_str(status, mapi_MAPISTATUS_vals, "Unknown MAPISTATUS error 0x%08x")); return offset; @@ -9809,7 +9807,7 @@ mapi_dissect_EcDoRpc_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi offset = dissect_deferred_pointers(pinfo, tvb, offset, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_mapi_MAPISTATUS_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Status: %s", val_to_str(status, mapi_MAPISTATUS_vals, "Unknown MAPISTATUS error 0x%08x")); return offset; @@ -9972,7 +9970,7 @@ mapi_dissect_EcRRegisterPushNotification_response(tvbuff_t *tvb _U_, int offset offset = dissect_deferred_pointers(pinfo, tvb, offset, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_mapi_MAPISTATUS_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Status: %s", val_to_str(status, mapi_MAPISTATUS_vals, "Unknown MAPISTATUS error 0x%08x")); return offset; @@ -10048,7 +10046,7 @@ mapi_dissect_EcRUnregisterPushNotification_response(tvbuff_t *tvb _U_, int offse offset = dissect_deferred_pointers(pinfo, tvb, offset, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_mapi_MAPISTATUS_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Status: %s", val_to_str(status, mapi_MAPISTATUS_vals, "Unknown MAPISTATUS error 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-nspi.c b/epan/dissectors/packet-dcerpc-nspi.c index 286e8dc7c6..7c51590ce5 100644 --- a/epan/dissectors/packet-dcerpc-nspi.c +++ b/epan/dissectors/packet-dcerpc-nspi.c @@ -9373,7 +9373,7 @@ nspi_dissect_NspiBind_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *p offset = dissect_deferred_pointers(pinfo, tvb, offset, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_nspi_MAPISTATUS_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Status: %s", val_to_str(status, nspi_MAPISTATUS_vals, "Unknown MAPISTATUS error 0x%08x")); return offset; @@ -9431,7 +9431,7 @@ nspi_dissect_NspiUnbind_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_deferred_pointers(pinfo, tvb, offset, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_nspi_MAPISTATUS_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Status: %s", val_to_str(status, nspi_MAPISTATUS_vals, "Unknown MAPISTATUS error 0x%08x")); return offset; @@ -9610,7 +9610,7 @@ nspi_dissect_NspiQueryRows_response(tvbuff_t *tvb _U_, int offset _U_, packet_in offset = dissect_deferred_pointers(pinfo, tvb, offset, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_nspi_MAPISTATUS_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Status: %s", val_to_str(status, nspi_MAPISTATUS_vals, "Unknown MAPISTATUS error 0x%08x")); return offset; @@ -9828,7 +9828,7 @@ nspi_dissect_NspiGetMatches_response(tvbuff_t *tvb _U_, int offset _U_, packet_i offset = dissect_deferred_pointers(pinfo, tvb, offset, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_nspi_MAPISTATUS_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Status: %s", val_to_str(status, nspi_MAPISTATUS_vals, "Unknown MAPISTATUS error 0x%08x")); return offset; @@ -9965,7 +9965,7 @@ nspi_dissect_NspiDNToEph_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_deferred_pointers(pinfo, tvb, offset, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_nspi_MAPISTATUS_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Status: %s", val_to_str(status, nspi_MAPISTATUS_vals, "Unknown MAPISTATUS error 0x%08x")); return offset; @@ -10102,7 +10102,7 @@ nspi_dissect_NspiGetProps_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf offset = dissect_deferred_pointers(pinfo, tvb, offset, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_nspi_MAPISTATUS_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Status: %s", val_to_str(status, nspi_MAPISTATUS_vals, "Unknown MAPISTATUS error 0x%08x")); return offset; @@ -10260,7 +10260,7 @@ nspi_dissect_NspiGetHierarchyInfo_response(tvbuff_t *tvb _U_, int offset _U_, pa offset = dissect_deferred_pointers(pinfo, tvb, offset, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_nspi_MAPISTATUS_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Status: %s", val_to_str(status, nspi_MAPISTATUS_vals, "Unknown MAPISTATUS error 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-rfr.c b/epan/dissectors/packet-dcerpc-rfr.c index 6fd6f57275..7d563c0b8e 100644 --- a/epan/dissectors/packet-dcerpc-rfr.c +++ b/epan/dissectors/packet-dcerpc-rfr.c @@ -336,7 +336,7 @@ rfr_dissect_RfrGetNewDSA_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_deferred_pointers(pinfo, tvb, offset, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_rfr_MAPISTATUS_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Status: %s", val_to_str(status, rfr_MAPISTATUS_vals, "Unknown MAPISTATUS error 0x%08x")); return offset; @@ -436,7 +436,7 @@ rfr_dissect_RfrGetFQDNFromLegacyDN_response(tvbuff_t *tvb _U_, int offset _U_, p offset = dissect_deferred_pointers(pinfo, tvb, offset, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_rfr_MAPISTATUS_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Status: %s", val_to_str(status, rfr_MAPISTATUS_vals, "Unknown MAPISTATUS error 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c index 8758e9ab15..dad263e551 100644 --- a/epan/dissectors/packet-dcerpc-samr.c +++ b/epan/dissectors/packet-dcerpc-samr.c @@ -9197,7 +9197,7 @@ samr_dissect_Connect_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9245,7 +9245,7 @@ samr_dissect_Close_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9314,7 +9314,7 @@ samr_dissect_SetSecurity_response(tvbuff_t *tvb _U_, int offset _U_, packet_info pinfo->dcerpc_procedure_name="SetSecurity"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9398,7 +9398,7 @@ samr_dissect_QuerySecurity_response(tvbuff_t *tvb _U_, int offset _U_, packet_in offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9443,7 +9443,7 @@ samr_dissect_Shutdown_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *p pinfo->dcerpc_procedure_name="Shutdown"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9531,7 +9531,7 @@ samr_dissect_LookupDomain_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9653,7 +9653,7 @@ samr_dissect_EnumDomains_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9746,7 +9746,7 @@ samr_dissect_OpenDomain_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9830,7 +9830,7 @@ samr_dissect_QueryDomainInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet_ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -9901,7 +9901,7 @@ samr_dissect_SetDomainInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet_in pinfo->dcerpc_procedure_name="SetDomainInfo"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10014,7 +10014,7 @@ samr_dissect_CreateDomainGroup_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10138,7 +10138,7 @@ samr_dissect_EnumDomainGroups_response(tvbuff_t *tvb _U_, int offset _U_, packet offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10251,7 +10251,7 @@ samr_dissect_CreateUser_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10384,7 +10384,7 @@ samr_dissect_EnumDomainUsers_response(tvbuff_t *tvb _U_, int offset _U_, packet_ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10499,7 +10499,7 @@ samr_dissect_CreateDomAlias_response(tvbuff_t *tvb _U_, int offset _U_, packet_i offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10623,7 +10623,7 @@ samr_dissect_EnumDomainAliases_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10707,7 +10707,7 @@ samr_dissect_GetAliasMembership_response(tvbuff_t *tvb _U_, int offset _U_, pack offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10826,7 +10826,7 @@ samr_dissect_LookupNames_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -10939,7 +10939,7 @@ samr_dissect_LookupRids_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11024,7 +11024,7 @@ samr_dissect_OpenGroup_response(tvbuff_t *tvb _U_, int offset _U_, packet_info * offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11108,7 +11108,7 @@ samr_dissect_QueryGroupInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet_i offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11179,7 +11179,7 @@ samr_dissect_SetGroupInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf pinfo->dcerpc_procedure_name="SetGroupInfo"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11244,7 +11244,7 @@ samr_dissect_AddGroupMember_response(tvbuff_t *tvb _U_, int offset _U_, packet_i pinfo->dcerpc_procedure_name="AddGroupMember"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11294,7 +11294,7 @@ samr_dissect_DeleteDomainGroup_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11346,7 +11346,7 @@ samr_dissect_DeleteGroupMember_response(tvbuff_t *tvb _U_, int offset _U_, packe pinfo->dcerpc_procedure_name="DeleteGroupMember"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11419,7 +11419,7 @@ samr_dissect_QueryGroupMember_response(tvbuff_t *tvb _U_, int offset _U_, packet offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11480,7 +11480,7 @@ samr_dissect_SetMemberAttributesOfGroup_response(tvbuff_t *tvb _U_, int offset _ pinfo->dcerpc_procedure_name="SetMemberAttributesOfGroup"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11565,7 +11565,7 @@ samr_dissect_OpenAlias_response(tvbuff_t *tvb _U_, int offset _U_, packet_info * offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11649,7 +11649,7 @@ samr_dissect_QueryAliasInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet_i offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11720,7 +11720,7 @@ samr_dissect_SetAliasInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf pinfo->dcerpc_procedure_name="SetAliasInfo"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11770,7 +11770,7 @@ samr_dissect_DeleteDomAlias_response(tvbuff_t *tvb _U_, int offset _U_, packet_i offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11830,7 +11830,7 @@ samr_dissect_AddAliasMember_response(tvbuff_t *tvb _U_, int offset _U_, packet_i pinfo->dcerpc_procedure_name="AddAliasMember"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11892,7 +11892,7 @@ samr_dissect_DeleteAliasMember_response(tvbuff_t *tvb _U_, int offset _U_, packe pinfo->dcerpc_procedure_name="DeleteAliasMember"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -11957,7 +11957,7 @@ samr_dissect_GetMembersInAlias_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -12038,7 +12038,7 @@ samr_dissect_OpenUser_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *p offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -12088,7 +12088,7 @@ samr_dissect_DeleteUser_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -12168,7 +12168,7 @@ samr_dissect_QueryUserInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet_in offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -12239,7 +12239,7 @@ samr_dissect_SetUserInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet_info pinfo->dcerpc_procedure_name="SetUserInfo"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -12424,7 +12424,7 @@ samr_dissect_ChangePasswordUser_response(tvbuff_t *tvb _U_, int offset _U_, pack pinfo->dcerpc_procedure_name="ChangePasswordUser"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -12515,7 +12515,7 @@ samr_dissect_GetGroupsForUser_response(tvbuff_t *tvb _U_, int offset _U_, packet offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -12654,7 +12654,7 @@ samr_dissect_QueryDisplayInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -12751,7 +12751,7 @@ samr_dissect_GetDisplayEnumerationIndex_response(tvbuff_t *tvb _U_, int offset _ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -12798,7 +12798,7 @@ samr_dissect_TestPrivateFunctionsDomain_response(tvbuff_t *tvb _U_, int offset _ pinfo->dcerpc_procedure_name="TestPrivateFunctionsDomain"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -12841,7 +12841,7 @@ samr_dissect_TestPrivateFunctionsUser_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="TestPrivateFunctionsUser"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -12904,7 +12904,7 @@ samr_dissect_GetUserPwInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet_in offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -12964,7 +12964,7 @@ samr_dissect_RemoveMemberFromForeignDomain_response(tvbuff_t *tvb _U_, int offse pinfo->dcerpc_procedure_name="RemoveMemberFromForeignDomain"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -13046,7 +13046,7 @@ samr_dissect_QueryDomainInfo2_response(tvbuff_t *tvb _U_, int offset _U_, packet offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -13128,7 +13128,7 @@ samr_dissect_QueryUserInfo2_response(tvbuff_t *tvb _U_, int offset _U_, packet_i offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -13269,7 +13269,7 @@ samr_dissect_QueryDisplayInfo2_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -13366,7 +13366,7 @@ samr_dissect_GetDisplayEnumerationIndex2_response(tvbuff_t *tvb _U_, int offset offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -13508,7 +13508,7 @@ samr_dissect_CreateUser2_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -13653,7 +13653,7 @@ samr_dissect_QueryDisplayInfo3_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -13721,7 +13721,7 @@ samr_dissect_AddMultipleMembersToAlias_response(tvbuff_t *tvb _U_, int offset _U pinfo->dcerpc_procedure_name="AddMultipleMembersToAlias"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -13783,7 +13783,7 @@ samr_dissect_RemoveMultipleMembersFromAlias_response(tvbuff_t *tvb _U_, int offs pinfo->dcerpc_procedure_name="RemoveMultipleMembersFromAlias"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -13879,7 +13879,7 @@ samr_dissect_OemChangePasswordUser2_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="OemChangePasswordUser2"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -14022,7 +14022,7 @@ samr_dissect_ChangePasswordUser2_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="ChangePasswordUser2"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -14097,7 +14097,7 @@ samr_dissect_GetDomPwInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -14172,7 +14172,7 @@ samr_dissect_Connect2_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *p offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -14243,7 +14243,7 @@ samr_dissect_SetUserInfo2_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf pinfo->dcerpc_procedure_name="SetUserInfo2"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -14317,7 +14317,7 @@ samr_dissect_SetBootKeyInformation_response(tvbuff_t *tvb _U_, int offset _U_, p pinfo->dcerpc_procedure_name="SetBootKeyInformation"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -14386,7 +14386,7 @@ samr_dissect_GetBootKeyInformation_response(tvbuff_t *tvb _U_, int offset _U_, p offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -14470,7 +14470,7 @@ samr_dissect_Connect3_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *p offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -14558,7 +14558,7 @@ samr_dissect_Connect4_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *p offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -14772,7 +14772,7 @@ samr_dissect_ChangePasswordUser3_response(tvbuff_t *tvb _U_, int offset _U_, pac offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -14927,7 +14927,7 @@ samr_dissect_Connect5_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *p offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -15013,7 +15013,7 @@ samr_dissect_RidToSid_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *p offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -15084,7 +15084,7 @@ samr_dissect_SetDsrmPassword_response(tvbuff_t *tvb _U_, int offset _U_, packet_ pinfo->dcerpc_procedure_name="SetDsrmPassword"; offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; @@ -15168,7 +15168,7 @@ samr_dissect_ValidatePassword_response(tvbuff_t *tvb _U_, int offset _U_, packet offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_status, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, NT_errors, "Unknown NT status 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-srvsvc.c b/epan/dissectors/packet-dcerpc-srvsvc.c index 914eaecf9e..af038acf99 100644 --- a/epan/dissectors/packet-dcerpc-srvsvc.c +++ b/epan/dissectors/packet-dcerpc-srvsvc.c @@ -14013,7 +14013,7 @@ srvsvc_dissect_NetCharDevEnum_response(tvbuff_t *tvb _U_, int offset _U_, packet offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -14102,7 +14102,7 @@ srvsvc_dissect_NetCharDevGetInfo_response(tvbuff_t *tvb _U_, int offset _U_, pac offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -14167,7 +14167,7 @@ srvsvc_dissect_NetCharDevControl_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="NetCharDevControl"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -14320,7 +14320,7 @@ srvsvc_dissect_NetCharDevQEnum_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -14420,7 +14420,7 @@ srvsvc_dissect_NetCharDevQGetInfo_response(tvbuff_t *tvb _U_, int offset _U_, pa offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -14516,7 +14516,7 @@ srvsvc_dissect_NetCharDevQSetInfo_response(tvbuff_t *tvb _U_, int offset _U_, pa offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -14576,7 +14576,7 @@ srvsvc_dissect_NetCharDevQPurge_response(tvbuff_t *tvb _U_, int offset _U_, pack pinfo->dcerpc_procedure_name="NetCharDevQPurge"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -14639,7 +14639,7 @@ srvsvc_dissect_NetCharDevQPurgeSelf_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="NetCharDevQPurgeSelf"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -14792,7 +14792,7 @@ srvsvc_dissect_NetConnEnum_response(tvbuff_t *tvb _U_, int offset _U_, packet_in offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -14968,7 +14968,7 @@ srvsvc_dissect_NetFileEnum_response(tvbuff_t *tvb _U_, int offset _U_, packet_in offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -15061,7 +15061,7 @@ srvsvc_dissect_NetFileGetInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -15117,7 +15117,7 @@ srvsvc_dissect_NetFileClose_response(tvbuff_t *tvb _U_, int offset _U_, packet_i pinfo->dcerpc_procedure_name="NetFileClose"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -15285,7 +15285,7 @@ srvsvc_dissect_NetSessEnum_response(tvbuff_t *tvb _U_, int offset _U_, packet_in offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -15374,7 +15374,7 @@ srvsvc_dissect_NetSessDel_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf pinfo->dcerpc_procedure_name="NetSessDel"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -15459,7 +15459,7 @@ srvsvc_dissect_NetShareAdd_response(tvbuff_t *tvb _U_, int offset _U_, packet_in offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -15597,7 +15597,7 @@ srvsvc_dissect_NetShareEnumAll_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -15686,7 +15686,7 @@ srvsvc_dissect_NetShareGetInfo_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -15780,7 +15780,7 @@ srvsvc_dissect_NetShareSetInfo_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -15849,7 +15849,7 @@ srvsvc_dissect_NetShareDel_response(tvbuff_t *tvb _U_, int offset _U_, packet_in pinfo->dcerpc_procedure_name="NetShareDel"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -15914,7 +15914,7 @@ srvsvc_dissect_NetShareDelSticky_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="NetShareDelSticky"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -15990,7 +15990,7 @@ srvsvc_dissect_NetShareCheck_response(tvbuff_t *tvb _U_, int offset _U_, packet_ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -16064,7 +16064,7 @@ srvsvc_dissect_NetSrvGetInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet_ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -16147,7 +16147,7 @@ srvsvc_dissect_NetSrvSetInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet_ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -16274,7 +16274,7 @@ srvsvc_dissect_NetDiskEnum_response(tvbuff_t *tvb _U_, int offset _U_, packet_in offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -16380,7 +16380,7 @@ srvsvc_dissect_NetServerStatisticsGet_response(tvbuff_t *tvb _U_, int offset _U_ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -16447,7 +16447,7 @@ srvsvc_dissect_NetTransportAdd_response(tvbuff_t *tvb _U_, int offset _U_, packe pinfo->dcerpc_procedure_name="NetTransportAdd"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -16583,7 +16583,7 @@ srvsvc_dissect_NetTransportEnum_response(tvbuff_t *tvb _U_, int offset _U_, pack offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -16652,7 +16652,7 @@ srvsvc_dissect_NetTransportDel_response(tvbuff_t *tvb _U_, int offset _U_, packe pinfo->dcerpc_procedure_name="NetTransportDel"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -16719,7 +16719,7 @@ srvsvc_dissect_NetRemoteTOD_response(tvbuff_t *tvb _U_, int offset _U_, packet_i offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -16797,7 +16797,7 @@ srvsvc_dissect_NetSetServiceBits_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="NetSetServiceBits"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -16884,7 +16884,7 @@ srvsvc_dissect_NetPathType_response(tvbuff_t *tvb _U_, int offset _U_, packet_in offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17007,7 +17007,7 @@ srvsvc_dissect_NetPathCanonicalize_response(tvbuff_t *tvb _U_, int offset _U_, p offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17096,7 +17096,7 @@ srvsvc_dissect_NetPathCompare_response(tvbuff_t *tvb _U_, int offset _U_, packet pinfo->dcerpc_procedure_name="NetPathCompare"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17174,7 +17174,7 @@ srvsvc_dissect_NetNameValidate_response(tvbuff_t *tvb _U_, int offset _U_, packe pinfo->dcerpc_procedure_name="NetNameValidate"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17207,7 +17207,7 @@ srvsvc_dissect_NETRPRNAMECANONICALIZE_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="NETRPRNAMECANONICALIZE"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17284,7 +17284,7 @@ srvsvc_dissect_NetPRNameCompare_response(tvbuff_t *tvb _U_, int offset _U_, pack pinfo->dcerpc_procedure_name="NetPRNameCompare"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17424,7 +17424,7 @@ srvsvc_dissect_NetShareEnum_response(tvbuff_t *tvb _U_, int offset _U_, packet_i offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17513,7 +17513,7 @@ srvsvc_dissect_NetShareDelStart_response(tvbuff_t *tvb _U_, int offset _U_, pack offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17563,7 +17563,7 @@ srvsvc_dissect_NetShareDelCommit_response(tvbuff_t *tvb _U_, int offset _U_, pac offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17645,7 +17645,7 @@ srvsvc_dissect_NetGetFileSecurity_response(tvbuff_t *tvb _U_, int offset _U_, pa offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17722,7 +17722,7 @@ srvsvc_dissect_NetSetFileSecurity_response(tvbuff_t *tvb _U_, int offset _U_, pa pinfo->dcerpc_procedure_name="NetSetFileSecurity"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17791,7 +17791,7 @@ srvsvc_dissect_NetServerTransportAddEx_response(tvbuff_t *tvb _U_, int offset _U pinfo->dcerpc_procedure_name="NetServerTransportAddEx"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17899,7 +17899,7 @@ srvsvc_dissect_NetServerSetServiceBitsEx_response(tvbuff_t *tvb _U_, int offset pinfo->dcerpc_procedure_name="NetServerSetServiceBitsEx"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17936,7 +17936,7 @@ srvsvc_dissect_NETRDFSGETVERSION_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="NETRDFSGETVERSION"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17961,7 +17961,7 @@ srvsvc_dissect_NETRDFSCREATELOCALPARTITION_response(tvbuff_t *tvb _U_, int offse pinfo->dcerpc_procedure_name="NETRDFSCREATELOCALPARTITION"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -17986,7 +17986,7 @@ srvsvc_dissect_NETRDFSDELETELOCALPARTITION_response(tvbuff_t *tvb _U_, int offse pinfo->dcerpc_procedure_name="NETRDFSDELETELOCALPARTITION"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -18011,7 +18011,7 @@ srvsvc_dissect_NETRDFSSETLOCALVOLUMESTATE_response(tvbuff_t *tvb _U_, int offset pinfo->dcerpc_procedure_name="NETRDFSSETLOCALVOLUMESTATE"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -18036,7 +18036,7 @@ srvsvc_dissect_NETRDFSSETSERVERINFO_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="NETRDFSSETSERVERINFO"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -18061,7 +18061,7 @@ srvsvc_dissect_NETRDFSCREATEEXITPOINT_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="NETRDFSCREATEEXITPOINT"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -18086,7 +18086,7 @@ srvsvc_dissect_NETRDFSDELETEEXITPOINT_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="NETRDFSDELETEEXITPOINT"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -18111,7 +18111,7 @@ srvsvc_dissect_NETRDFSMODIFYPREFIX_response(tvbuff_t *tvb _U_, int offset _U_, p pinfo->dcerpc_procedure_name="NETRDFSMODIFYPREFIX"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -18136,7 +18136,7 @@ srvsvc_dissect_NETRDFSFIXLOCALVOLUME_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="NETRDFSFIXLOCALVOLUME"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -18161,7 +18161,7 @@ srvsvc_dissect_NETRDFSMANAGERREPORTSITEINFO_response(tvbuff_t *tvb _U_, int offs pinfo->dcerpc_procedure_name="NETRDFSMANAGERREPORTSITEINFO"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -18186,7 +18186,7 @@ srvsvc_dissect_NETRSERVERTRANSPORTDELEX_response(tvbuff_t *tvb _U_, int offset _ pinfo->dcerpc_procedure_name="NETRSERVERTRANSPORTDELEX"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-winreg.c b/epan/dissectors/packet-dcerpc-winreg.c index 0c1ac942d7..046737d41f 100644 --- a/epan/dissectors/packet-dcerpc-winreg.c +++ b/epan/dissectors/packet-dcerpc-winreg.c @@ -1062,7 +1062,7 @@ winreg_dissect_OpenHKCR_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1136,7 +1136,7 @@ winreg_dissect_OpenHKCU_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1210,7 +1210,7 @@ winreg_dissect_OpenHKLM_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1284,7 +1284,7 @@ winreg_dissect_OpenHKPD_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1358,7 +1358,7 @@ winreg_dissect_OpenHKU_response(tvbuff_t *tvb _U_, int offset _U_, packet_info * offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1406,7 +1406,7 @@ winreg_dissect_CloseKey_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1542,7 +1542,7 @@ winreg_dissect_CreateKey_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1606,7 +1606,7 @@ winreg_dissect_DeleteKey_response(tvbuff_t *tvb _U_, int offset _U_, packet_info pinfo->dcerpc_procedure_name="DeleteKey"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1660,7 +1660,7 @@ winreg_dissect_DeleteValue_response(tvbuff_t *tvb _U_, int offset _U_, packet_in pinfo->dcerpc_procedure_name="DeleteValue"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1774,7 +1774,7 @@ winreg_dissect_EnumKey_response(tvbuff_t *tvb _U_, int offset _U_, packet_info * offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1942,7 +1942,7 @@ winreg_dissect_EnumValue_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1997,7 +1997,7 @@ winreg_dissect_FlushKey_response(tvbuff_t *tvb _U_, int offset _U_, packet_info pinfo->dcerpc_procedure_name="FlushKey"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2069,7 +2069,7 @@ winreg_dissect_GetKeySecurity_response(tvbuff_t *tvb _U_, int offset _U_, packet offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2150,7 +2150,7 @@ winreg_dissect_LoadKey_response(tvbuff_t *tvb _U_, int offset _U_, packet_info * pinfo->dcerpc_procedure_name="LoadKey"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2251,7 +2251,7 @@ winreg_dissect_NotifyChangeKeyValue_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="NotifyChangeKeyValue"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2353,7 +2353,7 @@ winreg_dissect_OpenKey_response(tvbuff_t *tvb _U_, int offset _U_, packet_info * offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2582,7 +2582,7 @@ winreg_dissect_QueryInfoKey_response(tvbuff_t *tvb _U_, int offset _U_, packet_i offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2724,7 +2724,7 @@ winreg_dissect_QueryValue_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2761,7 +2761,7 @@ winreg_dissect_ReplaceKey_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf pinfo->dcerpc_procedure_name="ReplaceKey"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2828,7 +2828,7 @@ winreg_dissect_RestoreKey_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf pinfo->dcerpc_procedure_name="RestoreKey"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2909,7 +2909,7 @@ winreg_dissect_SaveKey_response(tvbuff_t *tvb _U_, int offset _U_, packet_info * pinfo->dcerpc_procedure_name="SaveKey"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2982,7 +2982,7 @@ winreg_dissect_SetKeySecurity_response(tvbuff_t *tvb _U_, int offset _U_, packet pinfo->dcerpc_procedure_name="SetKeySecurity"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3081,7 +3081,7 @@ winreg_dissect_SetValue_response(tvbuff_t *tvb _U_, int offset _U_, packet_info pinfo->dcerpc_procedure_name="SetValue"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3116,7 +3116,7 @@ winreg_dissect_UnLoadKey_response(tvbuff_t *tvb _U_, int offset _U_, packet_info pinfo->dcerpc_procedure_name="UnLoadKey"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3201,7 +3201,7 @@ winreg_dissect_InitiateSystemShutdown_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="InitiateSystemShutdown"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3252,7 +3252,7 @@ winreg_dissect_AbortSystemShutdown_response(tvbuff_t *tvb _U_, int offset _U_, p pinfo->dcerpc_procedure_name="AbortSystemShutdown"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3315,7 +3315,7 @@ winreg_dissect_GetVersion_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3387,7 +3387,7 @@ winreg_dissect_OpenHKCC_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3461,7 +3461,7 @@ winreg_dissect_OpenHKDD_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3591,7 +3591,7 @@ winreg_dissect_QueryMultipleValues_response(tvbuff_t *tvb _U_, int offset _U_, p offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3695,7 +3695,7 @@ winreg_dissect_InitiateSystemShutdownEx_response(tvbuff_t *tvb _U_, int offset _ pinfo->dcerpc_procedure_name="InitiateSystemShutdownEx"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3732,7 +3732,7 @@ winreg_dissect_SaveKeyEx_response(tvbuff_t *tvb _U_, int offset _U_, packet_info pinfo->dcerpc_procedure_name="SaveKeyEx"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3802,7 +3802,7 @@ winreg_dissect_OpenHKPT_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3876,7 +3876,7 @@ winreg_dissect_OpenHKPN_response(tvbuff_t *tvb _U_, int offset _U_, packet_info offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -3905,7 +3905,7 @@ winreg_dissect_QueryMultipleValues2_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="QueryMultipleValues2"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_winreg_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; diff --git a/epan/dissectors/packet-dcerpc-wkssvc.c b/epan/dissectors/packet-dcerpc-wkssvc.c index db8d215005..fdef7034ea 100644 --- a/epan/dissectors/packet-dcerpc-wkssvc.c +++ b/epan/dissectors/packet-dcerpc-wkssvc.c @@ -6542,7 +6542,7 @@ wkssvc_dissect_NetWkstaGetInfo_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -6636,7 +6636,7 @@ wkssvc_dissect_NetWkstaSetInfo_response(tvbuff_t *tvb _U_, int offset _U_, packe offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -6757,7 +6757,7 @@ wkssvc_dissect_NetWkstaEnumUsers_response(tvbuff_t *tvb _U_, int offset _U_, pac offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -6838,7 +6838,7 @@ wkssvc_dissect_NetrWkstaUserGetInfo_response(tvbuff_t *tvb _U_, int offset _U_, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -6932,7 +6932,7 @@ wkssvc_dissect_NetrWkstaUserSetInfo_response(tvbuff_t *tvb _U_, int offset _U_, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -7053,7 +7053,7 @@ wkssvc_dissect_NetWkstaTransportEnum_response(tvbuff_t *tvb _U_, int offset _U_, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -7151,7 +7151,7 @@ wkssvc_dissect_NetrWkstaTransportAdd_response(tvbuff_t *tvb _U_, int offset _U_, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -7232,7 +7232,7 @@ wkssvc_dissect_NetrWkstaTransportDel_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="NetrWkstaTransportDel"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -7328,7 +7328,7 @@ wkssvc_dissect_NetrUseAdd_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -7429,7 +7429,7 @@ wkssvc_dissect_NetrUseGetInfo_response(tvbuff_t *tvb _U_, int offset _U_, packet offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -7508,7 +7508,7 @@ wkssvc_dissect_NetrUseDel_response(tvbuff_t *tvb _U_, int offset _U_, packet_inf pinfo->dcerpc_procedure_name="NetrUseDel"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -7627,7 +7627,7 @@ wkssvc_dissect_NetrUseEnum_response(tvbuff_t *tvb _U_, int offset _U_, packet_in offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -7753,7 +7753,7 @@ wkssvc_dissect_NetrMessageBufferSend_response(tvbuff_t *tvb _U_, int offset _U_, pinfo->dcerpc_procedure_name="NetrMessageBufferSend"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -7873,7 +7873,7 @@ wkssvc_dissect_NetrWorkstationStatisticsGet_response(tvbuff_t *tvb _U_, int offs offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -7925,7 +7925,7 @@ wkssvc_dissect_NetrLogonDomainNameAdd_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="NetrLogonDomainNameAdd"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -7971,7 +7971,7 @@ wkssvc_dissect_NetrLogonDomainNameDel_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="NetrLogonDomainNameDel"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -8106,7 +8106,7 @@ wkssvc_dissect_NetrJoinDomain_response(tvbuff_t *tvb _U_, int offset _U_, packet pinfo->dcerpc_procedure_name="NetrJoinDomain"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -8211,7 +8211,7 @@ wkssvc_dissect_NetrUnjoinDomain_response(tvbuff_t *tvb _U_, int offset _U_, pack pinfo->dcerpc_procedure_name="NetrUnjoinDomain"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -8332,7 +8332,7 @@ wkssvc_dissect_NetrRenameMachineInDomain_response(tvbuff_t *tvb _U_, int offset pinfo->dcerpc_procedure_name="NetrRenameMachineInDomain"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -8455,7 +8455,7 @@ wkssvc_dissect_NetrValidateName_response(tvbuff_t *tvb _U_, int offset _U_, pack pinfo->dcerpc_procedure_name="NetrValidateName"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -8560,7 +8560,7 @@ wkssvc_dissect_NetrGetJoinInformation_response(tvbuff_t *tvb _U_, int offset _U_ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -8735,7 +8735,7 @@ wkssvc_dissect_NetrGetJoinableOus_response(tvbuff_t *tvb _U_, int offset _U_, pa offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -8875,7 +8875,7 @@ wkssvc_dissect_NetrJoinDomain2_response(tvbuff_t *tvb _U_, int offset _U_, packe pinfo->dcerpc_procedure_name="NetrJoinDomain2"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -8977,7 +8977,7 @@ wkssvc_dissect_NetrUnjoinDomain2_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="NetrUnjoinDomain2"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -9095,7 +9095,7 @@ wkssvc_dissect_NetrRenameMachineInDomain2_response(tvbuff_t *tvb _U_, int offset pinfo->dcerpc_procedure_name="NetrRenameMachineInDomain2"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -9215,7 +9215,7 @@ wkssvc_dissect_NetrValidateName2_response(tvbuff_t *tvb _U_, int offset _U_, pac pinfo->dcerpc_procedure_name="NetrValidateName2"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -9393,7 +9393,7 @@ wkssvc_dissect_NetrGetJoinableOus2_response(tvbuff_t *tvb _U_, int offset _U_, p offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -9513,7 +9513,7 @@ wkssvc_dissect_NetrAddAlternateComputerName_response(tvbuff_t *tvb _U_, int offs pinfo->dcerpc_procedure_name="NetrAddAlternateComputerName"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -9633,7 +9633,7 @@ wkssvc_dissect_NetrRemoveAlternateComputerName_response(tvbuff_t *tvb _U_, int o pinfo->dcerpc_procedure_name="NetrRemoveAlternateComputerName"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -9753,7 +9753,7 @@ wkssvc_dissect_NetrSetPrimaryComputername_response(tvbuff_t *tvb _U_, int offset pinfo->dcerpc_procedure_name="NetrSetPrimaryComputername"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -9853,7 +9853,7 @@ wkssvc_dissect_NetrEnumerateComputerNames_response(tvbuff_t *tvb _U_, int offset offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; diff --git a/epan/dissectors/pidl/frsrpc.cnf b/epan/dissectors/pidl/frsrpc.cnf index 6eeb03e482..d49aa7cf53 100644 --- a/epan/dissectors/pidl/frsrpc.cnf +++ b/epan/dissectors/pidl/frsrpc.cnf @@ -84,7 +84,7 @@ frsrpc_dissect_enum_CommPktCommand(tvbuff_t *tvb _U_, int offset _U_, packet_inf s = frsrpc_frsrpc_CommPktCommand_vals[i].strptr; } } - if (s!= NULL && check_col(pinfo->cinfo, COL_INFO)) + if (s!= NULL) col_append_fstr(pinfo->cinfo, COL_INFO, ",command = %s", s); diff --git a/epan/dissectors/pidl/mapi/request.cnf.c b/epan/dissectors/pidl/mapi/request.cnf.c index d8e7e950b9..b92e258848 100644 --- a/epan/dissectors/pidl/mapi/request.cnf.c +++ b/epan/dissectors/pidl/mapi/request.cnf.c @@ -58,9 +58,7 @@ mapi_dissect_struct_EcDoRpc_MAPI_REQ(tvbuff_t *tvb _U_, int offset _U_, packet_i offset += 1; proto_tree_add_text(tree, tvb, cur_offset, offset - cur_offset, "opnum: %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation")); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " + %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation")); - } + col_append_fstr(pinfo->cinfo, COL_INFO, " + %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation")); cur_offset = offset; mapi_flags = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/pidl/mapi/response.cnf.c b/epan/dissectors/pidl/mapi/response.cnf.c index 4f36592644..14bb799682 100644 --- a/epan/dissectors/pidl/mapi/response.cnf.c +++ b/epan/dissectors/pidl/mapi/response.cnf.c @@ -60,9 +60,7 @@ mapi_dissect_struct_EcDoRpc_MAPI_REPL(tvbuff_t *tvb _U_, int offset _U_, packet_ offset += 1; proto_tree_add_text(tree, tvb, cur_offset, offset - cur_offset, "opnum: %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation: 0x%02x")); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " + %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation: 0x%02x")); - } + col_append_fstr(pinfo->cinfo, COL_INFO, " + %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation: 0x%02x")); if (opnum != op_MAPI_Notify) { cur_offset = offset; diff --git a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm index 0c0eb1fd02..5e1c13515c 100644 --- a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm +++ b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm @@ -527,12 +527,12 @@ sub Function($$$) if (not defined($fn->{RETURN_TYPE})) { } elsif ($fn->{RETURN_TYPE} eq "NTSTATUS") { $self->pidl_code("offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf\_$ifname\_status, &status);\n"); - $self->pidl_code("if (status != 0 && check_col(pinfo->cinfo, COL_INFO))"); + $self->pidl_code("if (status != 0)"); $self->pidl_code("\tcol_append_fstr(pinfo->cinfo, COL_INFO, \", Error: %s\", val_to_str(status, NT_errors, \"Unknown NT status 0x%08x\"));\n"); $return_types{$ifname}->{"status"} = ["NTSTATUS", "NT Error"]; } elsif ($fn->{RETURN_TYPE} eq "WERROR") { $self->pidl_code("offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf\_$ifname\_werror, &status);\n"); - $self->pidl_code("if (status != 0 && check_col(pinfo->cinfo, COL_INFO))"); + $self->pidl_code("if (status != 0)"); $self->pidl_code("\tcol_append_fstr(pinfo->cinfo, COL_INFO, \", Error: %s\", val_to_str(status, WERR_errors, \"Unknown DOS error 0x%08x\"));\n"); $return_types{$ifname}->{"werror"} = ["WERROR", "Windows Error"]; @@ -542,12 +542,12 @@ sub Function($$$) my $return_dissect = "dissect_ndr_" .Parse::Pidl::Typelist::enum_type_fn($type->{DATA}); $self->pidl_code("offset = $return_dissect(tvb, offset, pinfo, tree, drep, hf\_$ifname\_$fn->{RETURN_TYPE}_status, &status);"); - $self->pidl_code("if (status != 0 && check_col(pinfo->cinfo, COL_INFO))"); + $self->pidl_code("if (status != 0)"); $self->pidl_code("\tcol_append_fstr(pinfo->cinfo, COL_INFO, \", Status: %s\", val_to_str(status, $ifname\_$fn->{RETURN_TYPE}\_vals, \"Unknown " . $fn->{RETURN_TYPE} . " error 0x%08x\"));\n"); $return_types{$ifname}->{$fn->{RETURN_TYPE}."_status"} = [$fn->{RETURN_TYPE}, $fn->{RETURN_TYPE}]; } elsif ($type->{DATA}->{TYPE} eq "SCALAR") { $self->pidl_code("offset = dissect_ndr_$fn->{RETURN_TYPE}(tvb, offset, pinfo, tree, drep, hf\_$ifname\_$fn->{RETURN_TYPE}_status, &status);"); - $self->pidl_code("if (status != 0 && check_col(pinfo->cinfo, COL_INFO))"); + $self->pidl_code("if (status != 0)"); $self->pidl_code("\tcol_append_fstr(pinfo->cinfo, COL_INFO, \", Status: %d\", status);\n"); $return_types{$ifname}->{$fn->{RETURN_TYPE}."_status"} = [$fn->{RETURN_TYPE}, $fn->{RETURN_TYPE}]; } -- cgit v1.2.3