We always use start_offset, so don't wrap it in "#ifdef HAVE_KERBEROS".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26301 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c
index 62d60b937d030df44890cf0b8a6054fc9f7b12ba..db50eef85fc6841dbc6185573100744183f4af4a 100644 (file)
--- a/asn1/spnego/packet-spnego-template.c
+++ b/asn1/spnego/packet-spnego-template.c
@@ -894,9 +894,7 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo
        guint16 ec;
        guint16 rrc;
        int checksum_size;
-#ifdef HAVE_KERBEROS
        int start_offset=offset;
-#endif
 
        /*
         * The KRB5 blob conforms to RFC4121:

diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c
index 62e98e447bd0b09bc9b5df915f20e32d5a2b0360..4e342284139b75aa8e6637191fa58e37629189fd 100644 (file)
--- a/epan/dissectors/packet-spnego.c
+++ b/epan/dissectors/packet-spnego.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-spnego.c                                                            */
-/* ../../tools/asn2wrs.py -b -p spnego -c spnego.cnf -s packet-spnego-template spnego.asn */
+/* ../../tools/asn2wrs.py -b -p spnego -c ./spnego.cnf -s ./packet-spnego-template -D . spnego.asn */
 
 /* Input file: packet-spnego-template.c */
 
@@ -1393,9 +1393,7 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo
        guint16 ec;
        guint16 rrc;
        int checksum_size;
-#ifdef HAVE_KERBEROS
        int start_offset=offset;
-#endif
 
        /*
         * The KRB5 blob conforms to RFC4121:
@@ -1860,7 +1858,7 @@ void proto_register_spnego(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-spnego-hfarr.c ---*/
-#line 1276 "packet-spnego-template.c"
+#line 1274 "packet-spnego-template.c"
        };
 
        /* List of subtrees */
@@ -1882,7 +1880,7 @@ void proto_register_spnego(void) {
     &ett_spnego_InitialContextToken_U,
 
 /*--- End of included file: packet-spnego-ettarr.c ---*/
-#line 1286 "packet-spnego-template.c"
+#line 1284 "packet-spnego-template.c"
        };
 
        /* Register protocol */

diff --git a/epan/dissectors/packet-spnego.h b/epan/dissectors/packet-spnego.h
index 7dfc919ff94412e4cd061b28f891d78900212bfe..12eb70901d8d21a773dfce39fa3e943f21e2f0e5 100644 (file)
--- a/epan/dissectors/packet-spnego.h
+++ b/epan/dissectors/packet-spnego.h
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-spnego.h                                                            */
-/* ../../tools/asn2wrs.py -b -p spnego -c spnego.cnf -s packet-spnego-template spnego.asn */
+/* ../../tools/asn2wrs.py -b -p spnego -c ./spnego.cnf -s ./packet-spnego-template -D . spnego.asn */
 
 /* Input file: packet-spnego-template.h */