more ldap

wrote a script to do the merge, it will probably never be used again, but it appears to work.

I'll find out more in about an hour.