From owner-svn-src-user@FreeBSD.ORG  Tue Jan 12 10:06:32 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD645106566C;
	Tue, 12 Jan 2010 10:06:32 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AD9E38FC16;
	Tue, 12 Jan 2010 10:06:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0CA6W0n050253;
	Tue, 12 Jan 2010 10:06:32 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0CA6Wgf050251;
	Tue, 12 Jan 2010 10:06:32 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001121006.o0CA6Wgf050251@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 12 Jan 2010 10:06:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202148 - user/ed/utmpx/lib/libc/gen
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jan 2010 10:06:32 -0000

Author: ed
Date: Tue Jan 12 10:06:32 2010
New Revision: 202148
URL: http://svn.freebsd.org/changeset/base/202148

Log:
  Fix an off-by-one introduced in the previous commit.
  
  When receiving a partial match, we should overwrite the record itself.
  Because we call lseek() afterwards, we get the offset of the next to it.

Modified:
  user/ed/utmpx/lib/libc/gen/pututxline.c

Modified: user/ed/utmpx/lib/libc/gen/pututxline.c
==============================================================================
--- user/ed/utmpx/lib/libc/gen/pututxline.c	Tue Jan 12 09:55:25 2010	(r202147)
+++ user/ed/utmpx/lib/libc/gen/pututxline.c	Tue Jan 12 10:06:32 2010	(r202148)
@@ -91,7 +91,7 @@ utx_active_add(const struct futx *fu)
 		default:
 			/* Allow us to overwrite unused records. */
 			if (partial == -1)
-				partial = lseek(fd, 0, SEEK_CUR);
+				partial = lseek(fd, 0, SEEK_CUR) - sizeof fe;
 			break;
 		}
 	}