LDAPSunMerge: Difference between revisions

This page is to track the work to merge the Sun LDAP C SDK codebase back into mozilla.

=== liblber ===

* Sun is using ber typedefs for the ber tags, lengths, sizes, and they are using the same typedefs as OpenLDAP uses (e.g. see /usr/include/lber_types.h on a linux system).  This will help with OpenLDAP compatability.

* decode.c - Sun added explicit boundary checking for bad ber lengths, and explicit freeing of allocated buffers upon ber failures

=== libldap ===

* abandon.c - Quite a bit of work on abandon ops in Sun branch.

* cache.c - Simple printf format type difference (%d vs. %ld). Looks to be newer in Moz tip.

* charray.c - Looks to be newer code in Moz tip.

* disptmpl.c - Two refactored functions, nsldapi_free_strarray and nsldapi_next_line_tokens. Not sure which code is more recent.

* dsparse.c - Use of refactored functions nsldapi_free_strarray and nsldapi_next_line_tokens.

* getdn.c - Sun branch has a few small changes.  It has better variable initialization and uses a flag for finding the beginning quote when parsing.

* getdxbyname.c - Moz tip has some additional error checking.

* getfilter.c - Use of refactored functions nsldapi_free_strarray and nsldapi_next_line_tokens.  Moz tip adds checking for availability of snprintf before using it.

* getoption.c - Sun branch adds SASL options plus LDAP_OPT_NOREBIND and LDAP_X_OPT_SOCKBUF.  Moz tip has LDAP_OPT_EXTRA_THREAD_FN_PTRS.

* Makefile.in - A whole bunch of differences related to the changes in Makefile.client.

* memcache.c - Some differences in hash_result use.  Moz tip seems to be clearer code that does the same thing, but we need to look closer.  Moz tip also has some additional casting, etc.

* os-ip.c - Sun branch has new SASL code.  Moz tip looks to have some newer Windows related code and a bunch of ifdef NSLDAPI_AVOID_OS_SOCKETS code that the Sun branch doesn't have.

* request.c - Lots of differences here.  We'll need to go through this very closely.

* result.c - Lots of differences here.  We'll need to go through this very closely.

* search.c - Refactoring of ldap_put_filter vs. put_filter.

* setoption.c - Sun branch adds new SASL code and NOREBIND option.  A few other minor differences.

* srchpref.c - Uses refactored functions nsldapi_free_strarray and nsldapi_next_line_tokens.

* svrcore.c - New file in Sun branch

** We can use the open source svrcore now, so we can probably get rid of this file

* test.c - Moz tip code looks newer.

* unbind.c - Sun branch adds new SASL code.  Also a ber flush difference.

* url.c - Sun branch exposes nsldapi_url_parse as ldap_url_parse_no_defaults.

* utf8.c - Small variable initialization difference.  Moz tip looks more correct.

* vlistctrl.c - Small variable type difference.  Moz tip looks more correct.

=== tools ===

* common.c - Moz tip has some ARGPIN stuff and some platform ifdefs.  Sun has some SASL code.  Differences around pwpolicy and TLS/SSL/FORTEZZA.  The diffs are large for this file, so we'll need to go through it closely.

* convutf8.c - Moz tip uses iconv while Sun branch uses ICU.  Moz tip also has some Windows specific stuff.  We need to go through this closely.

=== libssldap ===

* Mozilla code seems to be more up to date and better organized with all deprecated and redundant code removed and secdb initialization reworked.  

* prerrstrs.h - Moz version has some additional error to string mappings.

=== libprldap ===

* Sun code seems more up to date with new functions.

* ldappr-int.h - Moz version defines new PRLDAP_MAX_SEND_SIZE to workaround some large send problem on Windows.