22
edits
LDAPSunMerge: Difference between revisions
Jump to navigation
Jump to search
→libldap
| Line 29: | Line 29: | ||
=== libldap === | === libldap === | ||
strike 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. | * authzidctrl.c - New file in Sun branch. | ||
| Line 34: | Line 37: | ||
* 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. | * cldap.c - 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. | ||
| Line 54: | Line 57: | ||
* open.c - Sun branch has new SASL code. A bunch of platform ifdefs around pthreads between the two code bases. | * open.c - 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. | * pwmodext.c - New file in Sun branch. | ||
* pwpctrl.c - New file in Sun branch. | * pwpctrl.c - 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 | ||