Merge pull request #23243 from ffontaine/fix-libpam-cpeid