added openldap to the mix, again