From 7135c935cdd70719471fb23113d65e9999da7df8 Mon Sep 17 00:00:00 2001
From: Anders Broman <anders.broman@ericsson.com>
Date: Tue, 10 Apr 2012 13:21:35 +0000
Subject: [PATCH] Propagate
 http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=42005 to
 template file.

svn path=/trunk/; revision=42006
---
 asn1/ldap/packet-ldap-template.c | 1 +
 epan/dissectors/packet-ldap.c    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index c5c6df7ea2..e22c96ea9a 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -982,6 +982,7 @@ static void
 ldap_frame_end(void)
 {
    ldap_found_in_frame = FALSE;
+   attr_type = NULL;
 }
 
 static void
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index ff2315037b..68d5a6a655 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -5746,7 +5746,7 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-ldap-hfarr.c ---*/
-#line 2203 "../../asn1/ldap/packet-ldap-template.c"
+#line 2204 "../../asn1/ldap/packet-ldap-template.c"
   };
 
   /* List of subtrees */
@@ -5821,7 +5821,7 @@ void proto_register_ldap(void) {
     &ett_ldap_T_warning,
 
 /*--- End of included file: packet-ldap-ettarr.c ---*/
-#line 2216 "../../asn1/ldap/packet-ldap-template.c"
+#line 2217 "../../asn1/ldap/packet-ldap-template.c"
   };
   /* UAT for header fields */
   static uat_field_t custom_attribute_types_uat_fields[] = {
@@ -5978,7 +5978,7 @@ proto_reg_handoff_ldap(void)
 
 
 /*--- End of included file: packet-ldap-dis-tab.c ---*/
-#line 2356 "../../asn1/ldap/packet-ldap-template.c"
+#line 2357 "../../asn1/ldap/packet-ldap-template.c"
 
 
 }