sync with upstream, allow masterserv to specify authpriv