54
edits
LDAPSunMerge: Difference between revisions
→tools
No edit summary |
(→tools) |
||
| Line 55: | Line 55: | ||
* 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. | ||
** If Sun only uses ICU for utf8 <-> local charset conversion, we should just get rid of ICU in favor of moz tip | |||
* fileurl.c - A few minor differences with file url parsing. Should be an easy merge. | * fileurl.c - A few minor differences with file url parsing. Should be an easy merge. | ||
* ldapcmp.c - A few function return type differences. Moz tip looks more correct at first glance. Moz tip also appears to have a few fixes for things such as specifying multiple host arguments. | * ldapcmp.c - A few function return type differences. Moz tip looks more correct at first glance. Moz tip also appears to have a few fixes for things such as specifying multiple host arguments. | ||
** Yep - Ulf submitted a patch for that in 2005 | |||
* ldapcompare.c - A few minor differences. Should be an easy merge. | * ldapcompare.c - A few minor differences. Should be an easy merge. | ||
* ldapdelete.c - Sun branch appears to have some new code, but a comment indicates that it broke iDS. We should review this before merging. | * ldapdelete.c - Sun branch appears to have some new code, but a comment indicates that it broke iDS. We should review this before merging. | ||
| Line 69: | Line 71: | ||
* list.h - New file in Sun branch. | * list.h - New file in Sun branch. | ||
* Makefile.client - General build differences for SASL, ICU, svrcore, new source files, platform stuff, etc. | * Makefile.client - General build differences for SASL, ICU, svrcore, new source files, platform stuff, etc. | ||
** Sun should use the new autoconf style build - we should get rid of the Makefile.client files | |||
* 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. | ||