+Fix $USER and $LOGNAME (not $MAIL) for /etc/passwd "root-..." lines.