From owner-svn-src-user@FreeBSD.ORG  Mon Jan 11 20:23:17 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 98E1C106568F;
	Mon, 11 Jan 2010 20:23:17 +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 493218FC1C;
	Mon, 11 Jan 2010 20:23:17 +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 o0BKNHCw066509;
	Mon, 11 Jan 2010 20:23:17 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0BKNH4u066507;
	Mon, 11 Jan 2010 20:23:17 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001112023.o0BKNH4u066507@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 11 Jan 2010 20:23:17 +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: r202111 - user/ed/utmpx/crypto/openssh
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: Mon, 11 Jan 2010 20:23:17 -0000

Author: ed
Date: Mon Jan 11 20:23:17 2010
New Revision: 202111
URL: http://svn.freebsd.org/changeset/base/202111

Log:
  Also use MIN_SIZEOF() for the line name inside the lastlog code.
  
  The use of MIN_SIZEOF() doesn't seem to be used consistenly throughout
  the code.

Modified:
  user/ed/utmpx/crypto/openssh/loginrec.c

Modified: user/ed/utmpx/crypto/openssh/loginrec.c
==============================================================================
--- user/ed/utmpx/crypto/openssh/loginrec.c	Mon Jan 11 20:07:24 2010	(r202110)
+++ user/ed/utmpx/crypto/openssh/loginrec.c	Mon Jan 11 20:23:17 2010	(r202111)
@@ -1567,9 +1567,10 @@ lastlog_get_entry(struct logininfo *li)
 		memset(&l, '\0', sizeof(l));
 		ll = &l;
 	}
-	line_fullname(li->line, ll->ll_line, sizeof(li->line));
+	line_fullname(li->line, ll->ll_line,
+	    MIN_SIZEOF(li->line, ll->ll_line));
 	strlcpy(li->hostname, ll->ll_host,
-		MIN_SIZEOF(li->hostname, ll->ll_host));
+	    MIN_SIZEOF(li->hostname, ll->ll_host));
 	li->tv_sec = ll->ll_tv.tv_sec;
 	li->tv_usec = ll->ll_tv.tv_usec;
 	return (1);