r22776: grab Simo's idmap_ldap fix (current with svn r22771)