Adapt apps/mac.c to use provider based MACs