aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/dissectors/packet-dcerpc-atsvc.c3
-rw-r--r--epan/dissectors/packet-dcerpc-dfs.c3
-rw-r--r--epan/dissectors/packet-dcerpc-dnsserver.c4
-rw-r--r--epan/dissectors/packet-dcerpc-dssetup.c1
-rw-r--r--epan/dissectors/packet-dcerpc-eventlog.c2
-rw-r--r--epan/dissectors/packet-dcerpc-frsrpc.c3
-rw-r--r--epan/dissectors/packet-dcerpc-frstrans.c1
-rw-r--r--epan/dissectors/packet-dcerpc-initshutdown.c1
-rw-r--r--epan/dissectors/packet-dcerpc-lsa.c12
-rw-r--r--epan/dissectors/packet-dcerpc-mapi.c1
-rw-r--r--epan/dissectors/packet-dcerpc-samr.c20
-rw-r--r--epan/dissectors/packet-dcerpc-winreg.c6
-rw-r--r--epan/dissectors/packet-dcerpc-witness.c3
-rw-r--r--epan/dissectors/pidl/lsa/lsa.cnf12
-rw-r--r--epan/dissectors/pidl/samr/samr.cnf15
-rw-r--r--epan/dissectors/pidl/winreg/winreg.cnf3
-rw-r--r--tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm1
17 files changed, 71 insertions, 20 deletions
diff --git a/epan/dissectors/packet-dcerpc-atsvc.c b/epan/dissectors/packet-dcerpc-atsvc.c
index afb9f2194d..a3c06e8885 100644
--- a/epan/dissectors/packet-dcerpc-atsvc.c
+++ b/epan/dissectors/packet-dcerpc-atsvc.c
@@ -395,6 +395,7 @@ atsvc_dissect_bitmap_DaysOfMonth(tvbuff_t *tvb _U_, int offset _U_, packet_info
&hf_atsvc_atsvc_DaysOfMonth_Twentyninth,
&hf_atsvc_atsvc_DaysOfMonth_Thirtieth,
&hf_atsvc_atsvc_DaysOfMonth_Thirtyfirst,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -434,6 +435,7 @@ atsvc_dissect_bitmap_Flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
&hf_atsvc_atsvc_Flags_JOB_RUNS_TODAY,
&hf_atsvc_atsvc_Flags_JOB_ADD_CURRENT_DATE,
&hf_atsvc_atsvc_Flags_JOB_NONINTERACTIVE,
+ NULL
};
guint8 flags;
@@ -476,6 +478,7 @@ atsvc_dissect_bitmap_DaysOfWeek(tvbuff_t *tvb _U_, int offset _U_, packet_info *
&hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_FRIDAY,
&hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_SATURDAY,
&hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_SUNDAY,
+ NULL
};
guint8 flags;
diff --git a/epan/dissectors/packet-dcerpc-dfs.c b/epan/dissectors/packet-dcerpc-dfs.c
index a10e0095b9..13c0d6a9f1 100644
--- a/epan/dissectors/packet-dcerpc-dfs.c
+++ b/epan/dissectors/packet-dcerpc-dfs.c
@@ -667,6 +667,7 @@ netdfs_dissect_bitmap_dfs_VolumeState(tvbuff_t *tvb _U_, int offset _U_, packet_
&hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_ONLINE,
&hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_STANDALONE,
&hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_AD_BLOB,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -799,6 +800,7 @@ netdfs_dissect_bitmap_dfs_StorageState(tvbuff_t *tvb _U_, int offset _U_, packet
&hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_OFFLINE,
&hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ONLINE,
&hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ACTIVE,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -1194,6 +1196,7 @@ netdfs_dissect_bitmap_dfs_PropertyFlags(tvbuff_t *tvb _U_, int offset _U_, packe
&hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_SITE_COSTING,
&hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_TARGET_FAILBACK,
&hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_CLUSTER_ENABLED,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
diff --git a/epan/dissectors/packet-dcerpc-dnsserver.c b/epan/dissectors/packet-dcerpc-dnsserver.c
index 020c58aab7..3b05e3769a 100644
--- a/epan/dissectors/packet-dcerpc-dnsserver.c
+++ b/epan/dissectors/packet-dcerpc-dnsserver.c
@@ -766,6 +766,7 @@ dnsserver_dissect_bitmap_DNS_LOG_LEVELS(tvbuff_t *tvb _U_, int offset _U_, packe
&hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_TCP,
&hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_FULL_PACKETS,
&hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_WRITE_THROUGH,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -801,6 +802,7 @@ dnsserver_dissect_bitmap_DNS_RPC_PROTOCOLS(tvbuff_t *tvb _U_, int offset _U_, pa
&hf_dnsserver_DNS_RPC_PROTOCOLS_DNS_RPC_USE_TCPIP,
&hf_dnsserver_DNS_RPC_PROTOCOLS_DNS_RPC_USE_NAMED_PIPE,
&hf_dnsserver_DNS_RPC_PROTOCOLS_DNS_RPC_USE_LPC,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -922,6 +924,7 @@ dnsserver_dissect_bitmap_DNS_SELECT_FLAGS(tvbuff_t *tvb _U_, int offset _U_, pac
&hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_ADDITIONAL_DATA,
&hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_NO_CHILDREN,
&hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_ONLY_CHILDREN,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -975,6 +978,7 @@ dnsserver_dissect_bitmap_DNS_RPC_NODE_FLAGS(tvbuff_t *tvb _U_, int offset _U_, p
&hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_OPEN_ACL,
&hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_AGING_ON,
&hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_SUPPRESS_NOTIFY,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
diff --git a/epan/dissectors/packet-dcerpc-dssetup.c b/epan/dissectors/packet-dcerpc-dssetup.c
index 3a6ea31af0..9d23b7152b 100644
--- a/epan/dissectors/packet-dcerpc-dssetup.c
+++ b/epan/dissectors/packet-dcerpc-dssetup.c
@@ -170,6 +170,7 @@ dssetup_dissect_bitmap_DsRoleFlags(tvbuff_t *tvb _U_, int offset _U_, packet_inf
&hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DS_MIXED_MODE,
&hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_UPGRADE_IN_PROGRESS,
&hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
diff --git a/epan/dissectors/packet-dcerpc-eventlog.c b/epan/dissectors/packet-dcerpc-eventlog.c
index 18456733f4..c2dc923fee 100644
--- a/epan/dissectors/packet-dcerpc-eventlog.c
+++ b/epan/dissectors/packet-dcerpc-eventlog.c
@@ -386,6 +386,7 @@ eventlog_dissect_bitmap_eventlogReadFlags(tvbuff_t *tvb _U_, int offset _U_, pac
&hf_eventlog_eventlogReadFlags_EVENTLOG_SEEK_READ,
&hf_eventlog_eventlogReadFlags_EVENTLOG_FORWARDS_READ,
&hf_eventlog_eventlogReadFlags_EVENTLOG_BACKWARDS_READ,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -427,6 +428,7 @@ eventlog_dissect_bitmap_eventlogEventTypes(tvbuff_t *tvb _U_, int offset _U_, pa
&hf_eventlog_eventlogEventTypes_EVENTLOG_INFORMATION_TYPE,
&hf_eventlog_eventlogEventTypes_EVENTLOG_AUDIT_SUCCESS,
&hf_eventlog_eventlogEventTypes_EVENTLOG_AUDIT_FAILURE,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
diff --git a/epan/dissectors/packet-dcerpc-frsrpc.c b/epan/dissectors/packet-dcerpc-frsrpc.c
index 63b48f319b..4564d285ce 100644
--- a/epan/dissectors/packet-dcerpc-frsrpc.c
+++ b/epan/dissectors/packet-dcerpc-frsrpc.c
@@ -907,6 +907,7 @@ frsrpc_dissect_bitmap_CommPktCoCmdFlags(tvbuff_t *tvb _U_, int offset _U_, packe
&hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_JUST_OID_RESET,
&hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_COMPRESSED_STAGE,
&hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_SKIP_VV_UPDATE,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -942,6 +943,7 @@ frsrpc_dissect_bitmap_CommPktCoCmdIFlags(tvbuff_t *tvb _U_, int offset _U_, pack
&hf_frsrpc_frsrpc_CommPktCoCmdIFlags_FRSRPC_CO_IFLAG_VVRETIRE_EXEC,
&hf_frsrpc_frsrpc_CommPktCoCmdIFlags_FRSRPC_CO_IFLAG_CO_ABORT,
&hf_frsrpc_frsrpc_CommPktCoCmdIFlags_FRSRPC_CO_IFLAG_DIR_ENUM_PENDING,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -1039,6 +1041,7 @@ frsrpc_dissect_bitmap_CommPktCoCmdContentCmd(tvbuff_t *tvb _U_, int offset _U_,
&hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_NEW_NAME,
&hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_BASIC_INFO_CHANGE,
&hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_COMPRESSION_CHANGE,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
diff --git a/epan/dissectors/packet-dcerpc-frstrans.c b/epan/dissectors/packet-dcerpc-frstrans.c
index a9832775c4..0c46b13f07 100644
--- a/epan/dissectors/packet-dcerpc-frstrans.c
+++ b/epan/dissectors/packet-dcerpc-frstrans.c
@@ -365,6 +365,7 @@ frstrans_dissect_bitmap_TransportFlags(tvbuff_t *tvb _U_, int offset _U_, packet
proto_item *item;
static const int * frstrans_frstrans_TransportFlags_fields[] = {
&hf_frstrans_frstrans_TransportFlags_FRSTRANS_TRANSPORT_SUPPORTS_RDC_SIMILARITY,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
diff --git a/epan/dissectors/packet-dcerpc-initshutdown.c b/epan/dissectors/packet-dcerpc-initshutdown.c
index 93d39a38f2..6c09f3ab6b 100644
--- a/epan/dissectors/packet-dcerpc-initshutdown.c
+++ b/epan/dissectors/packet-dcerpc-initshutdown.c
@@ -205,6 +205,7 @@ initshutdown_dissect_bitmap_ReasonFlags(tvbuff_t *tvb _U_, int offset _U_, packe
static const int * initshutdown_initshutdown_ReasonFlags_fields[] = {
&hf_initshutdown_initshutdown_ReasonFlags_SHTDN_REASON_FLAG_USER_DEFINED,
&hf_initshutdown_initshutdown_ReasonFlags_SHTDN_REASON_FLAG_PLANNED,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c
index 6350815885..67e97ec349 100644
--- a/epan/dissectors/packet-dcerpc-lsa.c
+++ b/epan/dissectors/packet-dcerpc-lsa.c
@@ -1330,7 +1330,8 @@ lsarpc_policy_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guin
&hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_TRUST_ADMIN,
&hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_GET_PRIVATE_INFORMATION,
&hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_VIEW_AUDIT_INFORMATION,
- &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_VIEW_LOCAL_INFORMATION
+ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_VIEW_LOCAL_INFORMATION,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
}
@@ -1341,7 +1342,8 @@ lsarpc_account_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, gui
&hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS,
&hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_QUOTAS,
&hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_PRIVILEGES,
- &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_VIEW
+ &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_VIEW,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
}
@@ -1350,7 +1352,8 @@ lsarpc_secret_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guin
{
static const int* access_flags[] = {
&hf_lsarpc_lsa_SecretAccessMask_LSA_SECRET_QUERY_VALUE,
- &hf_lsarpc_lsa_SecretAccessMask_LSA_SECRET_SET_VALUE
+ &hf_lsarpc_lsa_SecretAccessMask_LSA_SECRET_SET_VALUE,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
}
@@ -1364,7 +1367,8 @@ lsarpc_domain_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guin
&hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_QUERY_POSIX,
&hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_SET_CONTROLLERS,
&hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_QUERY_CONTROLLERS,
- &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_QUERY_DOMAIN_NAME
+ &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_QUERY_DOMAIN_NAME,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
}
diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c
index 1f62029908..3f742b476d 100644
--- a/epan/dissectors/packet-dcerpc-mapi.c
+++ b/epan/dissectors/packet-dcerpc-mapi.c
@@ -9223,6 +9223,7 @@ mapi_dissect_bitmap_ulEventType(tvbuff_t *tvb _U_, int offset _U_, packet_info *
&hf_mapi_ulEventType_fnevStatusObjectModified,
&hf_mapi_ulEventType_fnevReservedForMapi,
&hf_mapi_ulEventType_fnevExtended,
+ NULL
};
guint16 flags;
ALIGN_TO_2_BYTES;
diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c
index 0406c72853..f4e0aa3cf6 100644
--- a/epan/dissectors/packet-dcerpc-samr.c
+++ b/epan/dissectors/packet-dcerpc-samr.c
@@ -1993,7 +1993,8 @@ samr_connect_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint
&hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_CREATE_DOMAIN,
&hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_INITIALIZE_SERVER,
&hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_SHUTDOWN_SERVER,
- &hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_CONNECT_TO_SERVER
+ &hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_CONNECT_TO_SERVER,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
}
@@ -2019,7 +2020,8 @@ samr_alias_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32
&hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_REMOVE_MEMBER,
&hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_GET_MEMBERS,
&hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_LOOKUP_INFO,
- &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_SET_INFO
+ &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_SET_INFO,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
}
@@ -2045,7 +2047,8 @@ samr_group_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32
&hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_REMOVE_MEMBER,
&hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_ADD_MEMBER,
&hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_SET_INFO,
- &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_LOOKUP_INFO
+ &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_LOOKUP_INFO,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
}
@@ -2077,7 +2080,8 @@ samr_domain_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint3
&hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS,
&hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS,
&hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
- &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_3
+ &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_3,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
}
@@ -2109,7 +2113,8 @@ samr_user_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32
&hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_LOGONINFO,
&hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_SET_LOC_COM,
&hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_LOCALE,
- &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_NAME_ETC
+ &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_NAME_ETC,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
}
@@ -2385,6 +2390,7 @@ samr_dissect_bitmap_AcctFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
&hf_samr_samr_AcctFlags_ACB_PW_EXPIRED,
&hf_samr_samr_AcctFlags_ACB_TRUST_AUTH_DELEGAT,
&hf_samr_samr_AcctFlags_ACB_NO_AUTH_DATA_REQD,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -2659,6 +2665,7 @@ samr_dissect_bitmap_PasswordProperties(tvbuff_t *tvb _U_, int offset _U_, packet
&hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_LOCKOUT_ADMINS,
&hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_STORE_CLEARTEXT,
&hf_samr_samr_PasswordProperties_DOMAIN_REFUSE_PASSWORD_CHANGE,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -3719,6 +3726,7 @@ samr_dissect_bitmap_GroupAttrs(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
&hf_samr_samr_GroupAttrs_SE_GROUP_USE_FOR_DENY_ONLY,
&hf_samr_samr_GroupAttrs_SE_GROUP_RESOURCE,
&hf_samr_samr_GroupAttrs_SE_GROUP_LOGON_ID,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -5750,6 +5758,7 @@ samr_dissect_bitmap_FieldsPresent(tvbuff_t *tvb _U_, int offset _U_, packet_info
&hf_samr_samr_FieldsPresent_SAMR_FIELD_EXPIRED_FLAG,
&hf_samr_samr_FieldsPresent_SAMR_FIELD_SEC_DESC,
&hf_samr_samr_FieldsPresent_SAMR_FIELD_OWF_PWD,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -7893,6 +7902,7 @@ samr_dissect_bitmap_ValidateFieldsPresent(tvbuff_t *tvb _U_, int offset _U_, pac
&hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_BAD_PASSWORD_COUNT,
&hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_HISTORY_LENGTH,
&hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_HISTORY,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
diff --git a/epan/dissectors/packet-dcerpc-winreg.c b/epan/dissectors/packet-dcerpc-winreg.c
index b0d986ed95..1e63badd8e 100644
--- a/epan/dissectors/packet-dcerpc-winreg.c
+++ b/epan/dissectors/packet-dcerpc-winreg.c
@@ -574,7 +574,8 @@ winreg_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 acc
&hf_winreg_winreg_AccessMask_KEY_ENUMERATE_SUB_KEYS,
&hf_winreg_winreg_AccessMask_KEY_CREATE_SUB_KEY,
&hf_winreg_winreg_AccessMask_KEY_SET_VALUE,
- &hf_winreg_winreg_AccessMask_KEY_QUERY_VALUE
+ &hf_winreg_winreg_AccessMask_KEY_QUERY_VALUE,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
}
@@ -890,6 +891,7 @@ winreg_dissect_bitmap_KeyOptions(tvbuff_t *tvb _U_, int offset _U_, packet_info
&hf_winreg_winreg_KeyOptions_REG_OPTION_CREATE_LINK,
&hf_winreg_winreg_KeyOptions_REG_OPTION_BACKUP_RESTORE,
&hf_winreg_winreg_KeyOptions_REG_OPTION_OPEN_LINK,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -1108,6 +1110,7 @@ winreg_dissect_bitmap_NotifyChangeType(tvbuff_t *tvb _U_, int offset _U_, packet
&hf_winreg_winreg_NotifyChangeType_REG_NOTIFY_CHANGE_ATTRIBUTES,
&hf_winreg_winreg_NotifyChangeType_REG_NOTIFY_CHANGE_LAST_SET,
&hf_winreg_winreg_NotifyChangeType_REG_NOTIFY_CHANGE_SECURITY,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -1145,6 +1148,7 @@ winreg_dissect_bitmap_RestoreKeyFlags(tvbuff_t *tvb _U_, int offset _U_, packet_
&hf_winreg_winreg_RestoreKeyFlags_REG_REFRESH_HIVE,
&hf_winreg_winreg_RestoreKeyFlags_REG_NO_LAZY_FLUSH,
&hf_winreg_winreg_RestoreKeyFlags_REG_FORCE_RESTORE,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
diff --git a/epan/dissectors/packet-dcerpc-witness.c b/epan/dissectors/packet-dcerpc-witness.c
index 2c7ddf9148..d2ead202ae 100644
--- a/epan/dissectors/packet-dcerpc-witness.c
+++ b/epan/dissectors/packet-dcerpc-witness.c
@@ -412,6 +412,7 @@ witness_dissect_bitmap_interfaceInfo_flags(tvbuff_t *tvb _U_, int offset _U_, pa
&hf_witness_witness_interfaceInfo_flags_WITNESS_INFO_IPv4_VALID,
&hf_witness_witness_interfaceInfo_flags_WITNESS_INFO_IPv6_VALID,
&hf_witness_witness_interfaceInfo_flags_WITNESS_INFO_WITNESS_IF,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -713,6 +714,7 @@ witness_dissect_bitmap_IPaddrInfo_flags(tvbuff_t *tvb _U_, int offset _U_, packe
&hf_witness_witness_IPaddrInfo_flags_WITNESS_IPADDR_V6,
&hf_witness_witness_IPaddrInfo_flags_WITNESS_IPADDR_ONLINE,
&hf_witness_witness_IPaddrInfo_flags_WITNESS_IPADDR_OFFLINE,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
@@ -961,6 +963,7 @@ witness_dissect_bitmap_RegisterEx_flags(tvbuff_t *tvb _U_, int offset _U_, packe
static const int * witness_witness_RegisterEx_flags_fields[] = {
&hf_witness_witness_RegisterEx_flags_WITNESS_REGISTER_NONE,
&hf_witness_witness_RegisterEx_flags_WITNESS_REGISTER_IP_NOTIFICATION,
+ NULL
};
guint32 flags;
ALIGN_TO_4_BYTES;
diff --git a/epan/dissectors/pidl/lsa/lsa.cnf b/epan/dissectors/pidl/lsa/lsa.cnf
index 8cd4ddfbf9..01c0f56579 100644
--- a/epan/dissectors/pidl/lsa/lsa.cnf
+++ b/epan/dissectors/pidl/lsa/lsa.cnf
@@ -78,7 +78,8 @@ lsarpc_policy_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guin
&hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_TRUST_ADMIN,
&hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_GET_PRIVATE_INFORMATION,
&hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_VIEW_AUDIT_INFORMATION,
- &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_VIEW_LOCAL_INFORMATION
+ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_VIEW_LOCAL_INFORMATION,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
@@ -91,7 +92,8 @@ lsarpc_account_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, gui
&hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS,
&hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_QUOTAS,
&hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_PRIVILEGES,
- &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_VIEW
+ &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_VIEW,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
@@ -102,7 +104,8 @@ lsarpc_secret_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guin
{
static const int* access_flags[] = {
&hf_lsarpc_lsa_SecretAccessMask_LSA_SECRET_QUERY_VALUE,
- &hf_lsarpc_lsa_SecretAccessMask_LSA_SECRET_SET_VALUE
+ &hf_lsarpc_lsa_SecretAccessMask_LSA_SECRET_SET_VALUE,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
@@ -118,7 +121,8 @@ lsarpc_domain_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guin
&hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_QUERY_POSIX,
&hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_SET_CONTROLLERS,
&hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_QUERY_CONTROLLERS,
- &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_QUERY_DOMAIN_NAME
+ &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_QUERY_DOMAIN_NAME,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
diff --git a/epan/dissectors/pidl/samr/samr.cnf b/epan/dissectors/pidl/samr/samr.cnf
index beafe05284..5ccb2f9b0c 100644
--- a/epan/dissectors/pidl/samr/samr.cnf
+++ b/epan/dissectors/pidl/samr/samr.cnf
@@ -217,7 +217,8 @@ samr_connect_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint
&hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_CREATE_DOMAIN,
&hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_INITIALIZE_SERVER,
&hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_SHUTDOWN_SERVER,
- &hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_CONNECT_TO_SERVER
+ &hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_CONNECT_TO_SERVER,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
@@ -248,7 +249,8 @@ samr_alias_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32
&hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_REMOVE_MEMBER,
&hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_GET_MEMBERS,
&hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_LOOKUP_INFO,
- &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_SET_INFO
+ &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_SET_INFO,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
@@ -279,7 +281,8 @@ samr_group_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32
&hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_REMOVE_MEMBER,
&hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_ADD_MEMBER,
&hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_SET_INFO,
- &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_LOOKUP_INFO
+ &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_LOOKUP_INFO,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
@@ -316,7 +319,8 @@ samr_domain_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint3
&hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS,
&hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS,
&hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
- &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_3
+ &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_3,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
@@ -353,7 +357,8 @@ samr_user_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32
&hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_LOGONINFO,
&hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_SET_LOC_COM,
&hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_LOCALE,
- &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_NAME_ETC
+ &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_NAME_ETC,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
diff --git a/epan/dissectors/pidl/winreg/winreg.cnf b/epan/dissectors/pidl/winreg/winreg.cnf
index 47d1f28534..9afe7e6f15 100644
--- a/epan/dissectors/pidl/winreg/winreg.cnf
+++ b/epan/dissectors/pidl/winreg/winreg.cnf
@@ -146,7 +146,8 @@ winreg_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 acc
&hf_winreg_winreg_AccessMask_KEY_ENUMERATE_SUB_KEYS,
&hf_winreg_winreg_AccessMask_KEY_CREATE_SUB_KEY,
&hf_winreg_winreg_AccessMask_KEY_SET_VALUE,
- &hf_winreg_winreg_AccessMask_KEY_QUERY_VALUE
+ &hf_winreg_winreg_AccessMask_KEY_QUERY_VALUE,
+ NULL
};
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
diff --git a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index 24b61433ea..a62f9563a9 100644
--- a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
@@ -229,6 +229,7 @@ sub Bitmap($$$$)
$total_ev += hex($ev);
$self->pidl_code("&$hf_bitname,");
}
+ $self->pidl_code("NULL");
$self->deindent;
$self->pidl_code("};");
}