Clean up, reindent, add a special case for NIS / LDAP line

MFC after:	1 week


git-svn-id: svn+ssh://svn.freebsd.org/base/head@275765 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f