bugfixes in ldap
Merge branch 'ldap' into rabe