s3-build: try to fix the non-ldap build.