54
edits
LDAPSunMerge: Difference between revisions
no edit summary
No edit summary |
|||
| (11 intermediate revisions by 3 users not shown) | |||
| Line 1: | Line 1: | ||
== Done: (12/31/2007) Sun LDAP C SDK code has been merged in now and is available on the trunk == | |||
The LDAP C SDK release 6.0.2 contains all of the merged source code. | |||
This page is to track the work to merge the Sun LDAP C SDK codebase back into mozilla. | This page is to track the work to merge the Sun LDAP C SDK codebase back into mozilla. | ||
| Line 29: | Line 33: | ||
=== libldap === | === libldap === | ||
libldap is merged on the trunk. | |||
see Bugzilla Bug 357668 https://bugzilla.mozilla.org/show_bug.cgi?id=357668 for more details. | |||
see Bugzilla Bug 362619 https://bugzilla.mozilla.org/show_bug.cgi?id=362619 for more details. | |||
strike used to indicate that file or code within has already been merged. | |||
* abandon.c - Quite a bit of work on abandon ops in Sun branch. | * abandon.c - Quite a bit of work on abandon ops in Sun branch. | ||
* authzidctrl.c - New file in Sun branch. | * <strike>authzidctrl.c</strike> - New file in Sun branch. | ||
* cache.c - Simple printf format type difference (%d vs. %ld). Looks to be newer in Moz tip. | * 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. | * charray.c - Looks to be newer code in Moz tip. | ||
* cldap.c - Simple LDAP version const difference. | * <strike>cldap.c</strike> - Simple LDAP version const difference. | ||
* compat.c - Sun branch implments nsldapi_compat_strlcpy. Moz tip has an HPUX11 specific ifdef. | * <strike>compat.c</strike> - Sun branch implments nsldapi_compat_strlcpy. Moz tip has an HPUX11 specific ifdef. | ||
* control.c - Sun branch uses new ber types. | * <strike>control.c</strike> - Sun branch uses new ber types. | ||
* disptmpl.c - Two refactored functions, nsldapi_free_strarray and nsldapi_next_line_tokens. Not sure which code is more recent. | * 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. | * dsparse.c - Use of refactored functions nsldapi_free_strarray and nsldapi_next_line_tokens. | ||
* error.c - Both sides have some general cleanup. Moz tip adds checking for availability of snprintf before using it. Sun branch adds some frees and has better variable initialization. | * <strike>error.c</strike> - Both sides have some general cleanup. Moz tip adds checking for availability of snprintf before using it. Sun branch adds some frees and has better variable initialization. | ||
* extendop.c - Sun branch uses new ber types. Differences in a ber_printf section. Both very similar, but a few minor differences around an empty ber value. Need to look into this closer to see which is better. | * <strike>extendop.c</strike> - Sun branch uses new ber types. Differences in a ber_printf section. Both very similar, but a few minor differences around an empty ber value. Need to look into this closer to see which is better. | ||
* getattr.c - Sun branch uses new ber types. | * <strike>getattr.c</strike> - Sun branch uses new ber types. | ||
* 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. | * 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. | * getdxbyname.c - Moz tip has some additional error checking. | ||
* geteffectiverightsctrl.c - New file in Sun branch. | * <strike>geteffectiverightsctrl.c</strike> - New file in Sun branch. | ||
* 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. | * 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. | * 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. | ||
| Line 52: | Line 65: | ||
* Makefile.in - A whole bunch of differences related to the changes in Makefile.client. | * 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. | * 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. | ||
* open.c - Sun branch has new SASL code. A bunch of platform ifdefs around pthreads between the two code bases. | * <strike>open.c</strike> - Sun branch has new SASL code. A bunch of platform ifdefs around pthreads between the two code bases. | ||
* 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. | * 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. | ||
* psearch.c - Sun branch uses new ber types. | * <strike>psearch.c</strike> - Sun branch uses new ber types. | ||
* pwmodext.c - New file in Sun branch. | * <strike>pwmodext.c</strike> - New file in Sun branch. | ||
* pwpctrl.c - New file in Sun branch. | * <strike>pwpctrl.c</strike> - New file in Sun branch. | ||
* request.c - Lots of differences here. We'll need to go through this very closely. | * 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. | * result.c - Lots of differences here. We'll need to go through this very closely. | ||
* sasl.c - New file in Sun branch. | * <strike>sasl.c</strike> - New file in Sun branch. | ||
* saslbind.c - Sun branch adds some code to deal with controls. Also uses new ber types. | * <strike>saslbind.c</strike> - Sun branch adds some code to deal with controls. Also uses new ber types. | ||
* search.c - Refactoring of ldap_put_filter vs. put_filter. | * 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. | * setoption.c - Sun branch adds new SASL code and NOREBIND option. A few other minor differences. | ||
* sortctrl.c - Sun branch uses new ber types. | * <strike>sortctrl.c</strike> - Sun branch uses new ber types. | ||
* srchpref.c - Uses refactored functions nsldapi_free_strarray and nsldapi_next_line_tokens. | * srchpref.c - Uses refactored functions nsldapi_free_strarray and nsldapi_next_line_tokens. | ||
* svrcore.c - New file in Sun branch | * svrcore.c - New file in Sun branch | ||
** We can use the open source svrcore now, so we can probably get rid of this file | ** We can use the open source svrcore now, so we can probably get rid of this file | ||
* test.c - Moz tip code looks newer. | * test.c - Moz tip code looks newer. | ||
* uactrl.c - New file in Sun branch. | * <strike>uactrl.c</strike> - New file in Sun branch. | ||
* unbind.c - Sun branch adds new SASL code. Also a ber flush difference. | * 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. | * 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. | * utf8.c - Small variable initialization difference. Moz tip looks more correct. | ||
* vlistctrl.c - Small variable type difference. Moz tip looks more correct. | * vlistctrl.c - Small variable type difference. Moz tip looks more correct. | ||
* whoami.c - New file in Sun branch. | * <strike>whoami.c</strike> - New file in Sun branch. | ||
=== tools === | === tools === | ||
ldap tools are merged on the trunk. | |||
see Bugzilla Bug 364812 https://bugzilla.mozilla.org/show_bug.cgi?id=364812 for more details. | |||
* 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. | * 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. | * 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. | ||