Fixing this will be necessary for proper LDAP support.