correct pointlessly long label
fix ldap_insert: build dn correctly
Merge remote-tracking branch 'origin/master'