forked from osmocom/wireshark
LDAP: Display simple field as string
The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Uli Heilmeier
Michael Mann
parent
6573dd50d4
commit
af4e7f6315
|
|
@ -31,6 +31,7 @@ LDAPOID TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL
|
|||
Mechanism TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL
|
||||
AssertionValue TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL
|
||||
DirSyncFlags TYPE = FT_UINT32 DISPLAY = BASE_HEX STRINGS = NULL
|
||||
Simple TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL
|
||||
|
||||
#.REGISTER
|
||||
SearchControlValue B "1.2.840.113556.1.4.319" "pagedResultsControl"
|
||||
|
|
|
|||
|
|
@ -1145,7 +1145,7 @@ static int dissect_ldap_Filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_ldap_MessageID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 90 "./asn1/ldap/ldap.cnf"
|
||||
#line 91 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&MessageID);
|
||||
|
|
@ -1172,7 +1172,7 @@ dissect_ldap_INTEGER_1_127(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_ldap_LDAPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 300 "./asn1/ldap/ldap.cnf"
|
||||
#line 301 "./asn1/ldap/ldap.cnf"
|
||||
tvbuff_t *parameter_tvb = NULL;
|
||||
const char *ldapstring = NULL;
|
||||
gchar *sc = NULL; /* semi-colon pointer */
|
||||
|
|
@ -1280,7 +1280,7 @@ dissect_ldap_LDAPDN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
|
||||
static int
|
||||
dissect_ldap_Simple(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 147 "./asn1/ldap/ldap.cnf"
|
||||
#line 148 "./asn1/ldap/ldap.cnf"
|
||||
ldap_conv_info_t *ldap_info;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
|
|
@ -1299,7 +1299,7 @@ ldap_conv_info_t *ldap_info;
|
|||
|
||||
static int
|
||||
dissect_ldap_Mechanism(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 155 "./asn1/ldap/ldap.cnf"
|
||||
#line 156 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
ldap_conv_info_t *ldap_info;
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
|
@ -1344,7 +1344,7 @@ char *mechanism = NULL;
|
|||
|
||||
static int
|
||||
dissect_ldap_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 189 "./asn1/ldap/ldap.cnf"
|
||||
#line 190 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
ldap_conv_info_t *ldap_info;
|
||||
|
|
@ -1411,7 +1411,7 @@ dissect_ldap_SaslCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_ldap_T_ntlmsspNegotiate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 689 "./asn1/ldap/ldap.cnf"
|
||||
#line 690 "./asn1/ldap/ldap.cnf"
|
||||
/* make sure the protocol op comes first */
|
||||
ldap_do_protocolop(actx->pinfo);
|
||||
|
||||
|
|
@ -1427,7 +1427,7 @@ dissect_ldap_T_ntlmsspNegotiate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_ldap_T_ntlmsspAuth(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 696 "./asn1/ldap/ldap.cnf"
|
||||
#line 697 "./asn1/ldap/ldap.cnf"
|
||||
/* make sure the protocol op comes first */
|
||||
ldap_do_protocolop(actx->pinfo);
|
||||
|
||||
|
|
@ -1458,7 +1458,7 @@ static const ber_choice_t AuthenticationChoice_choice[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_AuthenticationChoice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 486 "./asn1/ldap/ldap.cnf"
|
||||
#line 487 "./asn1/ldap/ldap.cnf"
|
||||
gint branch = -1;
|
||||
gint auth = -1;
|
||||
const gchar *valstr;
|
||||
|
|
@ -1565,7 +1565,7 @@ static const value_string ldap_BindResponse_resultCode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_BindResponse_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 420 "./asn1/ldap/ldap.cnf"
|
||||
#line 421 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
const gchar *valstr;
|
||||
|
||||
|
|
@ -1591,7 +1591,7 @@ dissect_ldap_BindResponse_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_ldap_T_bindResponse_matchedDN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 703 "./asn1/ldap/ldap.cnf"
|
||||
#line 704 "./asn1/ldap/ldap.cnf"
|
||||
tvbuff_t *new_tvb=NULL;
|
||||
|
||||
offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_ldap_matchedDN, &new_tvb);
|
||||
|
|
@ -1628,7 +1628,7 @@ dissect_ldap_LDAPURL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#line 53 "./asn1/ldap/ldap.cnf"
|
||||
#line 54 "./asn1/ldap/ldap.cnf"
|
||||
PROTO_ITEM_SET_URL(actx->created_item);
|
||||
|
||||
|
||||
|
|
@ -1652,7 +1652,7 @@ dissect_ldap_Referral(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_ldap_ServerSaslCreds(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 230 "./asn1/ldap/ldap.cnf"
|
||||
#line 231 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb = NULL;
|
||||
ldap_conv_info_t *ldap_info;
|
||||
|
|
@ -1770,7 +1770,7 @@ dissect_ldap_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_ldap_UnbindRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 508 "./asn1/ldap/ldap.cnf"
|
||||
#line 509 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
implicit_tag = TRUE; /* correct problem with asn2wrs */
|
||||
|
||||
|
|
@ -1800,7 +1800,7 @@ static const value_string ldap_T_scope_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_T_scope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 388 "./asn1/ldap/ldap.cnf"
|
||||
#line 389 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
guint32 scope = 0xffff;
|
||||
const gchar *valstr;
|
||||
|
|
@ -1866,7 +1866,7 @@ static int
|
|||
dissect_ldap_T_and_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 554 "./asn1/ldap/ldap.cnf"
|
||||
#line 555 "./asn1/ldap/ldap.cnf"
|
||||
if(and_filter_string){
|
||||
and_filter_string=wmem_strdup_printf(wmem_packet_scope(), "(&%s%s)",and_filter_string,Filter_string);
|
||||
} else {
|
||||
|
|
@ -1884,7 +1884,7 @@ static const ber_sequence_t T_and_set_of[1] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_T_and(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 561 "./asn1/ldap/ldap.cnf"
|
||||
#line 562 "./asn1/ldap/ldap.cnf"
|
||||
proto_tree *tr=NULL;
|
||||
proto_item *it=NULL;
|
||||
const char *old_and_filter_string=and_filter_string;
|
||||
|
|
@ -1915,7 +1915,7 @@ static int
|
|||
dissect_ldap_T_or_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 579 "./asn1/ldap/ldap.cnf"
|
||||
#line 580 "./asn1/ldap/ldap.cnf"
|
||||
if(or_filter_string){
|
||||
or_filter_string=wmem_strdup_printf(wmem_packet_scope(), "(|%s%s)",or_filter_string,Filter_string);
|
||||
} else {
|
||||
|
|
@ -1934,7 +1934,7 @@ static const ber_sequence_t T_or_set_of[1] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_T_or(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 587 "./asn1/ldap/ldap.cnf"
|
||||
#line 588 "./asn1/ldap/ldap.cnf"
|
||||
proto_tree *tr;
|
||||
proto_item *it;
|
||||
const char *old_or_filter_string=or_filter_string;
|
||||
|
|
@ -1963,7 +1963,7 @@ static int
|
|||
dissect_ldap_T_not(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 606 "./asn1/ldap/ldap.cnf"
|
||||
#line 607 "./asn1/ldap/ldap.cnf"
|
||||
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(!%s)",string_or_null(Filter_string));
|
||||
|
||||
|
||||
|
|
@ -2001,7 +2001,7 @@ static int
|
|||
dissect_ldap_T_equalityMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 531 "./asn1/ldap/ldap.cnf"
|
||||
#line 532 "./asn1/ldap/ldap.cnf"
|
||||
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s=%s)",
|
||||
string_or_null(attributedesc_string),
|
||||
string_or_null(ldapvalue_string));
|
||||
|
|
@ -2032,7 +2032,7 @@ dissect_ldap_T_substringFilter_substrings_item(gboolean implicit_tag _U_, tvbuff
|
|||
T_substringFilter_substrings_item_choice, hf_index, ett_ldap_T_substringFilter_substrings_item,
|
||||
NULL);
|
||||
|
||||
#line 632 "./asn1/ldap/ldap.cnf"
|
||||
#line 633 "./asn1/ldap/ldap.cnf"
|
||||
if (substring_item_final) {
|
||||
substring_value=wmem_strdup_printf(wmem_packet_scope(), "%s%s",
|
||||
(substring_value?substring_value:"*"),
|
||||
|
|
@ -2072,7 +2072,7 @@ static const ber_sequence_t SubstringFilter_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_SubstringFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 646 "./asn1/ldap/ldap.cnf"
|
||||
#line 647 "./asn1/ldap/ldap.cnf"
|
||||
proto_tree *tr;
|
||||
proto_item *it;
|
||||
const char *old_substring_value=substring_value;
|
||||
|
|
@ -2106,7 +2106,7 @@ static int
|
|||
dissect_ldap_T_greaterOrEqual(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 537 "./asn1/ldap/ldap.cnf"
|
||||
#line 538 "./asn1/ldap/ldap.cnf"
|
||||
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s>=%s)",
|
||||
string_or_null(attributedesc_string),
|
||||
string_or_null(ldapvalue_string));
|
||||
|
|
@ -2122,7 +2122,7 @@ static int
|
|||
dissect_ldap_T_lessOrEqual(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 543 "./asn1/ldap/ldap.cnf"
|
||||
#line 544 "./asn1/ldap/ldap.cnf"
|
||||
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s<=%s)",
|
||||
string_or_null(attributedesc_string),
|
||||
string_or_null(ldapvalue_string));
|
||||
|
|
@ -2138,7 +2138,7 @@ static int
|
|||
dissect_ldap_T_present(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ldap_AttributeDescription(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 603 "./asn1/ldap/ldap.cnf"
|
||||
#line 604 "./asn1/ldap/ldap.cnf"
|
||||
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s=*)",string_or_null(Filter_string));
|
||||
|
||||
|
||||
|
|
@ -2151,7 +2151,7 @@ static int
|
|||
dissect_ldap_T_approxMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 549 "./asn1/ldap/ldap.cnf"
|
||||
#line 550 "./asn1/ldap/ldap.cnf"
|
||||
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s~=%s)",
|
||||
string_or_null(attributedesc_string),
|
||||
string_or_null(ldapvalue_string));
|
||||
|
|
@ -2173,7 +2173,7 @@ dissect_ldap_MatchingRuleId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_ldap_T_dnAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 609 "./asn1/ldap/ldap.cnf"
|
||||
#line 610 "./asn1/ldap/ldap.cnf"
|
||||
gboolean val;
|
||||
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, &val);
|
||||
|
|
@ -2208,7 +2208,7 @@ dissect_ldap_MatchingRuleAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_ldap_T_extensibleMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 618 "./asn1/ldap/ldap.cnf"
|
||||
#line 619 "./asn1/ldap/ldap.cnf"
|
||||
attr_type=NULL;
|
||||
matching_rule_string=NULL;
|
||||
ldapvalue_string=NULL;
|
||||
|
|
@ -2217,7 +2217,7 @@ dissect_ldap_T_extensibleMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
offset = dissect_ldap_MatchingRuleAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 624 "./asn1/ldap/ldap.cnf"
|
||||
#line 625 "./asn1/ldap/ldap.cnf"
|
||||
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s:%s%s%s=%s)",
|
||||
(attr_type?attr_type:""),
|
||||
(matching_rule_dnattr?"dn:":""),
|
||||
|
|
@ -2260,7 +2260,7 @@ static const ber_choice_t Filter_choice[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_Filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 667 "./asn1/ldap/ldap.cnf"
|
||||
#line 668 "./asn1/ldap/ldap.cnf"
|
||||
proto_tree *tr;
|
||||
proto_item *it;
|
||||
attributedesc_string=NULL;
|
||||
|
|
@ -2294,7 +2294,7 @@ dissect_ldap_Filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
|
||||
static int
|
||||
dissect_ldap_T_filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 520 "./asn1/ldap/ldap.cnf"
|
||||
#line 521 "./asn1/ldap/ldap.cnf"
|
||||
Filter_string=NULL;
|
||||
Filter_elements = 0;
|
||||
Filter_length = 0;
|
||||
|
|
@ -2302,7 +2302,7 @@ dissect_ldap_T_filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 525 "./asn1/ldap/ldap.cnf"
|
||||
#line 526 "./asn1/ldap/ldap.cnf"
|
||||
Filter_string=NULL;
|
||||
and_filter_string=NULL;
|
||||
Filter_elements = 0;
|
||||
|
|
@ -2360,7 +2360,7 @@ dissect_ldap_SearchRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_ldap_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 450 "./asn1/ldap/ldap.cnf"
|
||||
#line 451 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
tvbuff_t *next_tvb = NULL;
|
||||
gchar *string;
|
||||
|
|
@ -2520,7 +2520,7 @@ static const value_string ldap_T_resultCode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_T_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 404 "./asn1/ldap/ldap.cnf"
|
||||
#line 405 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
const gchar *valstr;
|
||||
|
||||
|
|
@ -2587,7 +2587,7 @@ dissect_ldap_SEQUENCE_OF_LDAPURL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_ldap_SearchResultReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 796 "./asn1/ldap/ldap.cnf"
|
||||
#line 797 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
|
||||
hf_index, BER_CLASS_APP, 19, TRUE, dissect_ldap_SEQUENCE_OF_LDAPURL);
|
||||
|
|
@ -2864,7 +2864,7 @@ dissect_ldap_CompareResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_ldap_AbandonRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 803 "./asn1/ldap/ldap.cnf"
|
||||
#line 804 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
|
||||
hf_index, BER_CLASS_APP, 16, TRUE, dissect_ldap_MessageID);
|
||||
|
|
@ -2881,7 +2881,7 @@ dissect_ldap_AbandonRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_ldap_LDAPOID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 56 "./asn1/ldap/ldap.cnf"
|
||||
#line 57 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
const gchar *name;
|
||||
|
|
@ -2891,7 +2891,7 @@ dissect_ldap_LDAPOID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
#line 64 "./asn1/ldap/ldap.cnf"
|
||||
#line 65 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
object_identifier_id = NULL;
|
||||
|
||||
|
|
@ -2925,7 +2925,7 @@ dissect_ldap_LDAPOID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
|
||||
static int
|
||||
dissect_ldap_T_requestValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 738 "./asn1/ldap/ldap.cnf"
|
||||
#line 739 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
if((object_identifier_id != NULL) && oid_has_dissector(object_identifier_id)) {
|
||||
offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
|
||||
|
|
@ -3016,7 +3016,7 @@ static const value_string ldap_ExtendedResponse_resultCode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_ExtendedResponse_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 435 "./asn1/ldap/ldap.cnf"
|
||||
#line 436 "./asn1/ldap/ldap.cnf"
|
||||
guint32 resultCode;
|
||||
ldap_conv_info_t *ldap_info = (ldap_conv_info_t *)actx->private_data;
|
||||
|
||||
|
|
@ -3088,12 +3088,12 @@ dissect_ldap_ExtendedResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_ldap_T_intermediateResponse_responseValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 746 "./asn1/ldap/ldap.cnf"
|
||||
#line 747 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
const gchar *name;
|
||||
|
||||
|
||||
#line 750 "./asn1/ldap/ldap.cnf"
|
||||
#line 751 "./asn1/ldap/ldap.cnf"
|
||||
if(ldm_tree && object_identifier_id) {
|
||||
proto_item_set_text(ldm_tree, "%s %s", "IntermediateResponse", object_identifier_id);
|
||||
name = oid_resolved_from_string(wmem_packet_scope(), object_identifier_id);
|
||||
|
|
@ -3191,7 +3191,7 @@ static const ber_choice_t ProtocolOp_choice[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_ProtocolOp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 98 "./asn1/ldap/ldap.cnf"
|
||||
#line 99 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
ldap_call_response_t *lcrp;
|
||||
ldap_conv_info_t *ldap_info = (ldap_conv_info_t *)actx->private_data;
|
||||
|
|
@ -3202,7 +3202,7 @@ dissect_ldap_ProtocolOp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
ProtocolOp_choice, hf_index, ett_ldap_ProtocolOp,
|
||||
&ProtocolOp);
|
||||
|
||||
#line 104 "./asn1/ldap/ldap.cnf"
|
||||
#line 105 "./asn1/ldap/ldap.cnf"
|
||||
|
||||
if (ProtocolOp == -1) {
|
||||
return offset;
|
||||
|
|
@ -3262,7 +3262,7 @@ dissect_ldap_ControlType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_ldap_T_controlValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 719 "./asn1/ldap/ldap.cnf"
|
||||
#line 720 "./asn1/ldap/ldap.cnf"
|
||||
gint8 ber_class;
|
||||
gboolean pc, ind;
|
||||
gint32 tag;
|
||||
|
|
@ -3433,7 +3433,7 @@ dissect_ldap_SortResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_ldap_DirSyncFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 763 "./asn1/ldap/ldap.cnf"
|
||||
#line 764 "./asn1/ldap/ldap.cnf"
|
||||
gint8 ber_class;
|
||||
gboolean pc;
|
||||
gint32 tag;
|
||||
|
|
@ -5322,7 +5322,7 @@ void proto_register_ldap(void) {
|
|||
"AuthenticationChoice", HFILL }},
|
||||
{ &hf_ldap_simple,
|
||||
{ "simple", "ldap.simple",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
FT_STRING, BASE_NONE, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_ldap_sasl,
|
||||
{ "sasl", "ldap.sasl_element",
|
||||
|
|
|
|||
Loading…
Reference in New Issue