Re: [SSSD] [PATCHES] Second refactoring wave for #1747