2408739 ntomask needs to take AF_*
6 files changed