fa36ec2
minor fixes for bdb 4.2/4.3 and mozldap (cherry-picked from 32ab01f55684859213bfebf8190b82ba84f374c5)