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

MFC after:	1 week