From Kovarththanan Rajaratnam via bug 3548:

(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770

1 files changed, 19 insertions, 19 deletions

diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c
index becf07b542..9e7f554604 100644
--- a/epan/dissectors/packet-spnego.c
+++ b/epan/dissectors/packet-spnego.c
@@ -1817,17 +1817,17 @@ void proto_register_spnego(void) {
 	static hf_register_info hf[] = {
 		{ &hf_spnego,
 		  { "SPNEGO", "spnego", FT_NONE, BASE_NONE, NULL, 0x0,
-		    "SPNEGO", HFILL }},
+		    NULL, HFILL }},
 		{ &hf_spnego_wraptoken,
 		  { "wrapToken", "spnego.wraptoken",
 		    FT_NONE, BASE_NONE, NULL, 0x0, "SPNEGO wrapToken",
 		    HFILL}},
 		{ &hf_spnego_krb5,
 		  { "krb5_blob", "spnego.krb5.blob", FT_BYTES,
-		    BASE_NONE, NULL, 0, "krb5_blob", HFILL }},
+		    BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_spnego_krb5_oid,
 		  { "KRB5 OID", "spnego.krb5_oid", FT_STRING,
-		    BASE_NONE, NULL, 0, "KRB5 OID", HFILL }},
+		    BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_spnego_krb5_tok_id,
 		  { "krb5_tok_id", "spnego.krb5.tok_id", FT_UINT16, BASE_HEX,
 		    VALS(spnego_krb5_tok_id_vals), 0, "KRB5 Token Id", HFILL}},
@@ -1847,20 +1847,20 @@ void proto_register_spnego(void) {
 		  { "krb5_confounder", "spnego.krb5.confounder", FT_BYTES, BASE_NONE,
 		    NULL, 0, "KRB5 Confounder", HFILL}},
 		{ &hf_spnego_krb5_filler,
-		  { "krb5_filler", "spnego.krb5.filler", FT_BYTES, BASE_HEX,
+		  { "krb5_filler", "spnego.krb5.filler", FT_BYTES, BASE_NONE,
 		    NULL, 0, "KRB5 Filler", HFILL}},
 		{ &hf_spnego_krb5_cfx_flags,
 		  { "krb5_cfx_flags", "spnego.krb5.cfx_flags", FT_UINT8, BASE_HEX,
 		    NULL, 0, "KRB5 CFX Flags", HFILL}},
 		{ &hf_spnego_krb5_cfx_flags_01,
 		  { "SendByAcceptor", "spnego.krb5.send_by_acceptor", FT_BOOLEAN, 8,
-		    TFS (&flags_set_truth), 0x01, "", HFILL}},
+		    TFS (&flags_set_truth), 0x01, NULL, HFILL}},
 		{ &hf_spnego_krb5_cfx_flags_02,
 		  { "Sealed", "spnego.krb5.sealed", FT_BOOLEAN, 8,
-		    TFS (&flags_set_truth), 0x02, "", HFILL}},
+		    TFS (&flags_set_truth), 0x02, NULL, HFILL}},
 		{ &hf_spnego_krb5_cfx_flags_04,
 		  { "AcceptorSubkey", "spnego.krb5.acceptor_subkey", FT_BOOLEAN, 8,
-		    TFS (&flags_set_truth), 0x04, "", HFILL}},
+		    TFS (&flags_set_truth), 0x04, NULL, HFILL}},
 		{ &hf_spnego_krb5_cfx_ec,
 		  { "krb5_cfx_ec", "spnego.krb5.cfx_ec", FT_UINT16, BASE_DEC,
 		    NULL, 0, "KRB5 CFX Extra Count", HFILL}},
@@ -1896,15 +1896,15 @@ void proto_register_spnego(void) {
         "spnego.MechTypeList", HFILL }},
     { &hf_spnego_reqFlags,
       { "reqFlags", "spnego.reqFlags",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "spnego.ContextFlags", HFILL }},
     { &hf_spnego_mechToken,
       { "mechToken", "spnego.mechToken",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "spnego.T_mechToken", HFILL }},
     { &hf_spnego_negTokenInit_mechListMIC,
       { "mechListMIC", "spnego.mechListMIC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "spnego.T_NegTokenInit_mechListMIC", HFILL }},
     { &hf_spnego_negResult,
       { "negResult", "spnego.negResult",
@@ -1916,11 +1916,11 @@ void proto_register_spnego(void) {
         "spnego.T_supportedMech", HFILL }},
     { &hf_spnego_responseToken,
       { "responseToken", "spnego.responseToken",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "spnego.T_responseToken", HFILL }},
     { &hf_spnego_mechListMIC,
       { "mechListMIC", "spnego.mechListMIC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "spnego.T_mechListMIC", HFILL }},
     { &hf_spnego_thisMech,
       { "thisMech", "spnego.thisMech",
@@ -1933,31 +1933,31 @@ void proto_register_spnego(void) {
     { &hf_spnego_ContextFlags_delegFlag,
       { "delegFlag", "spnego.delegFlag",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_spnego_ContextFlags_mutualFlag,
       { "mutualFlag", "spnego.mutualFlag",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_spnego_ContextFlags_replayFlag,
       { "replayFlag", "spnego.replayFlag",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_spnego_ContextFlags_sequenceFlag,
       { "sequenceFlag", "spnego.sequenceFlag",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_spnego_ContextFlags_anonFlag,
       { "anonFlag", "spnego.anonFlag",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_spnego_ContextFlags_confFlag,
       { "confFlag", "spnego.confFlag",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_spnego_ContextFlags_integFlag,
       { "integFlag", "spnego.integFlag",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-spnego-hfarr.c ---*/
 #line 1376 "packet-spnego-template.c"