Merge pull request #813 from njh/openldap_symbol_fix