Commit Graph

179 Commits

Author SHA1 Message Date
Stig Bjørlykke a7c5d642d5 Regenerate ASN.1 dissectors to update the #line directive.
svn path=/trunk/; revision=37118
2011-05-13 08:12:27 +00:00
Jeff Morriss 9be16e49c4 From Stefan Metzmacher and Gregor Beck via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5850 :
The smallest LDAP PDU is 7 bytes, not 4.

svn path=/trunk/; revision=36777
2011-04-21 19:51:05 +00:00
Gerald Combs 793d683575 Regenerate the ANSI MAP, LDAP, and TETRA dissectors so that Coverity can
locate their template files.

svn path=/trunk/; revision=36569
2011-04-11 23:07:53 +00:00
Gerald Combs 670d38ec71 Properly initialize our filter counters.
svn path=/trunk/; revision=36190
2011-03-14 16:00:51 +00:00
Gerald Combs 91fe31c9b4 If we encounter an excessively long filter string or one with too many
elements, add an expert item and throw a ReportedBoundsError. We may
want to handle this more cleanly in the future but this avoids
allocating a huge amount of memory.

svn path=/trunk/; revision=36101
2011-03-01 00:50:17 +00:00
Gerald Combs 4783795690 Split get_dns_name() into get_dns_name() and expand_dns_name().
In dissect_ms_compressed_string() dissect_mscldap_string() simply call
expand_dns_name() instead of using duplicate (and insecure) code. This
*might* break CLDAP and SMB dissection. If that's the case we should
probably revert get_dns_name() and simplify expand_dns_name().

Fixes infinite recursion errors found by joernchen of Phenoelit.

svn path=/trunk/; revision=36029
2011-02-23 00:51:02 +00:00
Chris Maynard 8d47cebd00 Declare ett's as gint, not guint.
svn path=/trunk/; revision=35902
2011-02-10 20:55:26 +00:00
Anders Broman b2992b2310 ldap.cnf:782: warning: ISO C90 forbids mixed declarations and code
svn path=/trunk/; revision=35476
2011-01-11 11:41:03 +00:00
Ronnie Sahlberg 3079c9c931 From Matthieu Patou <mat@samba.org>
Dissect LDAP DirSyncFlags to show the bits of this bitmap.



svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
Stephen Fisher 802308ca01 More misc. CLDAP improvements for Active Directory including updating
field names and adding descriptions, changing the Domain GUID in the "LDAP
ping" response to a FT_GUID instead of FT_BYTES, etc.


svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
Stephen Fisher a9761c53b7 More minor cleanup/fixes for MS Active Directory's use of CLDAP.
svn path=/trunk/; revision=35404
2011-01-06 18:50:39 +00:00
Stephen Fisher 89d9b73e47 Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits
in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1,
revision 26 (11/19/2010).  Also re-format code a bit.


svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Jeff Morriss f2fc5d42fd Make some prefs callback functions static. (These modules don't use proto_reg_handoff_*() as their prefs callback.)
svn path=/trunk/; revision=35138
2010-12-06 22:08:48 +00:00
Anders Broman 6dc449e99c The CLDAP attribute value on a CLDAP reply is no longer being decoded
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5239

It got broken in Revision 33390 I think, if attr_type is unset at this point it should be set in the calling function.
http://anonsvn.wireshark.org/viewvc/trunk/asn1/ldap/ldap.cnf?r1=33388&r2=33390

svn path=/trunk/; revision=34176
2010-09-21 14:56:55 +00:00
Gerald Combs 6aaa5874c6 Initialize more variables.
svn path=/trunk/; revision=33392
2010-07-01 00:11:14 +00:00
Gerald Combs caff9b5513 Initialize a variable.
svn path=/trunk/; revision=33390
2010-06-30 23:45:24 +00:00
Gerald Combs 47c6bf912f Initialize a variable.
svn path=/trunk/; revision=33388
2010-06-30 23:36:24 +00:00
Gerald Combs 6d60493b8a Initialize attributedesc_string in a couple of places so that we
don't end up trying to use an invalid pointer.

svn path=/trunk/; revision=33341
2010-06-27 22:38:28 +00:00
Jeff Morriss 81da8e0b6b Use find_or_create_conversation() in some ASN.1 dissectors
svn path=/trunk/; revision=32791
2010-05-13 18:55:31 +00:00
Jeff Morriss a0c858efcd Add a little more code to avoid not-very-useful blurbs:
- Change spaces in the name to underscores before comparing it to the blurb.
  - Check if the type simply as T_ prepended to the name.
  - Don't put in a blurb of "NULL".

and regenerate the dissectors.

svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
Jeff Morriss 996a6b3817 Regenerate a few more of the ASN.1 dissectors
svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
Bill Meier f8b92f8d0b #include <stdio.h> not needed.
svn path=/trunk/; revision=32405
2010-04-06 17:01:14 +00:00
Anders Broman c1defb60a7 Try to fix compilation with MSVC.
Please review.

svn path=/trunk/; revision=31962
2010-02-23 06:28:34 +00:00
Guy Harris b395a98305 Squelch a bunch of compiler warnings.
svn path=/trunk/; revision=31961
2010-02-23 04:35:23 +00:00
Ronnie Sahlberg cb37c28c37 Export the dissect_mscldap_string() that is used to dissect
compressed dns strings.



svn path=/trunk/; revision=31650
2010-01-25 05:38:22 +00:00
Anders Broman 9a030dda05 Get rid of check_col();
svn path=/trunk/; revision=31552
2010-01-17 18:16:06 +00:00
Gerald Combs afc57e6fac Add NULL pointer checks. Fixes the fuzz crash in bug 4351.
svn path=/trunk/; revision=31362
2009-12-24 21:23:38 +00:00
Jaap Keuter e1ec979363 From Mathieu Parent:
As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol],
see the attached patch that dissects IntermediateMessage.

svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
Gerasimos Dimitriadis 142b31816c From Mathieu Parent:
Dissector for LDAP Content Synchronization Operation
(Modified in order to remove the unneeded oid_add_from_string's)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309

svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
Gerasimos Dimitriadis eff8b8dd39 From Bug 4298:
Add additional LDAP OIDs for LDAP Content Synchronization Operation
(Slightly modified in order to add code in packet-ldap-template.c)

svn path=/trunk/; revision=31179
2009-12-04 23:09:37 +00:00
Kovarththanan Rajaratnam ed5ff812fd Use gint when declaring a tree type variable
svn path=/trunk/; revision=31040
2009-11-21 10:45:27 +00:00
Stig Bjørlykke 5c0369ba97 Apply r30376 to asn1 template files.
svn path=/trunk/; revision=30767
2009-10-30 10:21:35 +00:00
Anders Broman 88bb44a51e From Jakub Zawadzki:
Cleanup dissector code - use proper memory functions.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4164

svn path=/trunk/; revision=30691
2009-10-25 11:43:30 +00:00
Kovarththanan Rajaratnam 4f2332256c Remove unused variable
svn path=/trunk/; revision=30506
2009-10-11 14:21:50 +00:00
Kovarththanan Rajaratnam 19ee815ea4 Regenerate asn1 dissectors (no functionality change)
svn path=/trunk/; revision=30476
2009-10-10 13:39:14 +00:00
Kovarththanan Rajaratnam 78b0ee16e2 Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector
svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
Kovarththanan Rajaratnam 9490d1b74c Regenerate asn1 dissectors (no change, only some line offset changes)
svn path=/trunk/; revision=30454
2009-10-09 21:34:49 +00:00
Kovarththanan Rajaratnam 00810ff199 * Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards

svn path=/trunk/; revision=30127
2009-09-24 20:21:23 +00:00
Jörg Mayer 822d0a2242 No need to include packet-frame.h
svn path=/trunk/; revision=29665
2009-09-02 15:52:11 +00:00
Kovarththanan Rajaratnam 8b515e9340 Switch a bunch of dissectors over to using tvb_new_subset_remaining()
svn path=/trunk/; revision=29446
2009-08-16 12:36:22 +00:00
Ronnie Sahlberg ac1b52a838 From: Matthieu Patou <mat+Informatique.Samba@matws.net>
Date: Mon, 27 Jul 2009 08:55:55 +0000 (+0200)
Subject: patch_ldap_260709

Add a few additional LDAP OIDs
and increase the maximum SASL blob size to be 1M instead of 256kb



svn path=/trunk/; revision=29210
2009-07-28 07:18:05 +00:00
Stig Bjørlykke 0437f102c3 From Kovarththanan Rajaratnam:
More FT_XXX cleanup.

svn path=/trunk/; revision=28971
2009-07-07 09:02:59 +00:00
Anders Broman f16859def3 From Kovarththanan Rajaratnam:
Cleanup header_field_info definitions
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3548

svn path=/trunk/; revision=28940
2009-07-05 11:49:36 +00:00
Stig Bjørlykke 4721f29558 Changed check for having multiple ldap PDU's in one frame.
The previous check is incorrect when the first ldap frame in the capture is
selected and the filter is changed, or selecting "Follow TCP Stream".

Also removed check_col().

svn path=/trunk/; revision=28889
2009-06-30 10:38:00 +00:00
Stig Bjørlykke 942b03f06e Cleanup protocol name for ldap.
svn path=/trunk/; revision=28888
2009-06-30 08:28:21 +00:00
Stig Bjørlykke 9733aadcfe Re-generate asn1 dissectors after hf_register_info cleanup.
svn path=/trunk/; revision=28848
2009-06-26 03:59:01 +00:00
Stig Bjørlykke 7614d925c2 More header_field_info cleanup.
svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
Graeme Lunt 05a3dca2bc LDAP control support for Password policy for LDAP directories.
svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
Stig Bjørlykke b228488bc0 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
2009-06-18 21:30:42 +00:00