Merge pull request #3291 from jboeuf/auth_asan_fixes

Fixing #3286