s4-auth: Don't check for NULL saltPrincipal if it doesn't need it