r21720: Try to make 'TEST_LDAP=yes make test' work again. These recent