I've merged in many changes from HEAD into OPENLDAP_REL_ENG_2_1 for inclusion in the next patch release (including a great deal of experimental code behind #ifdefs). Please test and report any problems through the Issue Tracking System. Thanks, Kurt