22
edits
LDAPSunMerge: Difference between revisions
no edit summary
No edit summary |
|||
| Line 76: | Line 76: | ||
* Options.txt - Command-line options. Mozilla tip look more up-to-date. I'm not sure if this file was kept in sync with the actual options used in the Sun branch. | * Options.txt - Command-line options. Mozilla tip look more up-to-date. I'm not sure if this file was kept in sync with the actual options used in the Sun branch. | ||
* tools.mak - New file in Sun branch. | * tools.mak - New file in Sun branch. | ||
=== 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. | |||
* secerrstrs.h - Moz version has some additional error to string mappings. | |||
* sslerrstrs.h - Moz version has some additional error to string mappings. | |||
* clientinit.c - diffs mainly related to basic NSS initialization with Moz version containing more up to date code in regard of handling secdb file or folder names. | |||
** ldapssl_basic_init() has changed in Moz version to take secdb pathnames as args and take care of initialization based on that. it allows to get rid of bunch of redundant functions and duplicated code in Sun branch. | |||
** internal memory allocation functions disabled in Moz version. | |||
** Sun version does SSL_OptionSetDefault(SSL_ENABLE_TLS, PR_TRUE) in addition to SSL2 and SSL3 where Moz version does not. | |||
** Sun version keeps around now deprecated ldapssl_tls_start_s() and ldapssl_tls_start() that are now replaced with ldap_start_tls_s(). | |||
* errormap.c - practically same. two static const vs const and one macro vs value differences. | |||
* ldapsinit.c - in general subtle changes dealing with session info and error handling. | |||
** Moz version has better error handling in ldapssl_init(). | |||
** do_ldapssl_connect() in Sun version == ldapssl_connect() in Moz ver, additional arg in Sun version but implementations are same with only one additional error check in Mozilla version. | |||
** Moz version contains new sslopt2string() function and supporting struct for debugging. | |||
** Sun version contains now redundant ldapssl_import_fd(), ldapssl_reset_to_nonsecure() and ldapssl_enableSSL_on_open_connection() to support deprecated ldapssl_tls_start* functions. | |||
* libssldap.rc - new file on Sun branch to deal with native version and vendor information on Windows, similar files exist for other libraries and tools. not a killer feature but must have in absence of ident/what on Windows. | |||
* Makefile* - bunch of diffs as expected due to static makefiles in Sun version. main diffs as well as for other libs and tools are RPATH args and version information added on Sun branch. | |||
=== 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. | |||
** Sun version has new prldap_socket_arg_from_ld() function. | |||
* ldappr-dns.c - Sun version has new prldap_getpeername() function. | |||
* ldappr-error.c - Moz version defines some additional platform specific error code macros, dunno if they really needed today or can be deprecated, needs a closer look later on. | |||
** some platform specific macros that are common aggregated in one place in Moz version. | |||
* ldappr-io.c - PRLDAP_MAX_SEND_SIZE handling in prldap_write() of Moz version. | |||
** prldap_socket_arg_from_ld() implementation in Sun version. | |||
** one additional free in prldap_connect() of Sun version and one additional error check in prldap_try_one_address() of Moz version. | |||
* ldappr-public.c - Sun version has these new functions: prldap_get_default_socket_info(), prldap_set_default_socket_info(). | |||
** Moz version defines socket as int where Sun version defines socket as LBER_SOCKET in prldap_import_connection(). | |||
* ldappr-threads.c - exactly the same code on both branches. | |||
* libprldap.rc - new file on Sun branch to deal with native version and vendor information on Windows, similar files exist for other libraries and tools. not a killer feature but must have in absence of ident/what on Windows. | |||
* Makefile* - bunch of diffs as expected due to static makefiles in Sun version. main diffs as well as for other libs and tools are RPATH args and version information added on Sun branch. | |||