4
edits
LDAPSunMerge: Difference between revisions
Added analysis of tools source directory differences
(Added analysis of libldap and liblber differences) |
(Added analysis of tools source directory differences) |
||
| Line 51: | Line 51: | ||
** 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. | ** whoami.c - New file in Sun branch. | ||
* tools | |||
** 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. | |||
** 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. | |||
** 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. | |||
** ldapmodify.c - Some minor fixes appear to be in the Moz tip. Very little new from the Sun branch. Should be an easy merge. | |||
** ldapmodrdn.c - Minor difference in the way main is defined. Sun branch is more clear. | |||
** ldappasswd.c - New file in Sun branch. | |||
** ldapsearch.c - A few function return type differences, casting, usage message differences, and SASL option differences. A small amount of ICU vs. iconv related stuff. Sun branch has some get effective rights stuff. We'll need to go through this closely. | |||
** ldaptool.h - Sun branch has some get effective rights, password related code, and linked-list structures that appear to be used for recursive entry deletion by ldapdelete. | |||
** ldaptool-sasl.c - New file in Sun branch. | |||
** ldaptool-sasl.h - New file in Sun branch. | |||
** list.c - 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. | |||
** 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. | |||