From owner-freebsd-questions@FreeBSD.ORG  Wed Nov  3 02:01:39 2004
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 64F5A16A4CE
	for <freebsd-questions@freebsd.org>;
	Wed,  3 Nov 2004 02:01:39 +0000 (GMT)
Received: from sccrmhc13.comcast.net (sccrmhc13.comcast.net [204.127.202.64])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1B46943D5A
	for <freebsd-questions@freebsd.org>;
	Wed,  3 Nov 2004 02:01:39 +0000 (GMT)
	(envelope-from fbsd-questions@trini0.org)
Received: from hivemind.trini0.org (trini0.org[65.34.205.195])
          by comcast.net (sccrmhc13) with ESMTP
          id <20041103020137016000vmsue>; Wed, 3 Nov 2004 02:01:37 +0000
Received: from [127.0.0.1] (winxp.trini0.org [192.168.0.18])
	by hivemind.trini0.org (Postfix) with ESMTP id 031E8D2
	for <freebsd-questions@freebsd.org>;
	Tue,  2 Nov 2004 21:01:37 -0500 (EST)
Message-ID: <41883BFF.5040000@trini0.org>
Date: Tue, 02 Nov 2004 21:01:35 -0500
From: Gerard Samuel <fbsd-questions@trini0.org>
User-Agent: Mozilla Thunderbird 0.8 (Windows/20040913)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: freebsd-questions@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Upgrading 5.2.1 to 5.3R2
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>,
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>,
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Nov 2004 02:01:39 -0000

Ok, so I upgraded, ran mergemaster, and merged /etc/group (and 
/etc/master.passwd I think) via mergemaster.
I merged those files to retain my non root user account.
I rebooted, and I haven't been able to log into my non root account.
I tried to readd the account via adduser, but it says that the user 
already exists.
So I tried rmuser, and it says that the user doesn't exist.
So I manually removed the account name from /etc/group, 
/etc/master.passwd, /etc/passwd,
and tried to add the user, via adduser.
When it tries to add the user, it fails (dont remember the message right 
now).
Anyone has any suggestions on how I can get the old user account back??
N.B. I did back up /etc before mergemaster...
Thanks