54
edits
LDAPSunMerge: Difference between revisions
→libldap
(→tools) |
|||
| Line 28: | Line 28: | ||
* ldap-int.h - Moz tip has more platform specific ifdefs. Sun branch has some FD_SETSIZE and SASL changes. Various other refactoring, etc. | * ldap-int.h - Moz tip has more platform specific ifdefs. Sun branch has some FD_SETSIZE and SASL changes. Various other refactoring, etc. | ||
* Makefile.client - Sun branch adds new source files, SASL linking and includes. A few other differences. | * Makefile.client - Sun branch adds new source files, SASL linking and includes. A few other differences. | ||
** We should use autoconf for builds, get rid of Makefile.client | |||
* 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. | ||
| Line 44: | Line 45: | ||
* 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 | |||
* test.c - Moz tip code looks newer. | * test.c - Moz tip code looks newer. | ||
* uactrl.c - New file in Sun branch. | * uactrl.c - New file in Sun branch. | ||