22
edits
LDAPSunMerge: Difference between revisions
→libldap
| Line 35: | Line 35: | ||
* 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. | ||
* <strike>compat.c</strike> - 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. | ||
* <strike>control.c</strike> - Sun branch uses new ber types. | * <strike>control.c</strike> - Sun branch uses new ber types. | ||
| Line 48: | Line 48: | ||
* 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 57: | Line 57: | ||
* 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. | ||
* <strike>psearch.c</strike> - Sun branch uses new ber types. | * <strike>psearch.c</strike> - Sun branch uses new ber types. | ||
* <strike>pwmodext.c</strike> - 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. | ||
| Line 73: | Line 73: | ||
** 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 === | ||