From owner-svn-src-user@FreeBSD.ORG  Wed Jan  6 07:50:27 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 D2B9C1065672;
	Wed,  6 Jan 2010 07:50:27 +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 C2CBC8FC14;
	Wed,  6 Jan 2010 07:50:27 +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 o067oR3s058868;
	Wed, 6 Jan 2010 07:50:27 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o067oRLV058865;
	Wed, 6 Jan 2010 07:50:27 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001060750.o067oRLV058865@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 6 Jan 2010 07:50:27 +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: r201632 - 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: Wed, 06 Jan 2010 07:50:27 -0000

Author: ed
Date: Wed Jan  6 07:50:27 2010
New Revision: 201632
URL: http://svn.freebsd.org/changeset/base/201632

Log:
  Make OpenSSH and utmpx actually work.
  
  I wonder why I need these modifications. I would have expected OpenSSH
  to work out of the box.

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

Modified: user/ed/utmpx/crypto/openssh/defines.h
==============================================================================
--- user/ed/utmpx/crypto/openssh/defines.h	Wed Jan  6 06:42:08 2010	(r201631)
+++ user/ed/utmpx/crypto/openssh/defines.h	Wed Jan  6 07:50:27 2010	(r201632)
@@ -674,7 +674,7 @@ struct winsize {
 #else
 /* Simply select your favourite login types. */
 /* Can't do if-else because some systems use several... <sigh> */
-#  if defined(UTMPX_FILE) && !defined(DISABLE_UTMPX)
+#  if !defined(DISABLE_UTMPX)
 #    define USE_UTMPX
 #  endif
 #  if defined(UTMP_FILE) && !defined(DISABLE_UTMP)

Modified: user/ed/utmpx/crypto/openssh/loginrec.c
==============================================================================
--- user/ed/utmpx/crypto/openssh/loginrec.c	Wed Jan  6 06:42:08 2010	(r201631)
+++ user/ed/utmpx/crypto/openssh/loginrec.c	Wed Jan  6 07:50:27 2010	(r201632)
@@ -758,8 +758,8 @@ construct_utmpx(struct logininfo *li, st
 	utx->ut_pid = li->pid;
 
 	/* strncpy(): Don't necessarily want null termination */
-	strncpy(utx->ut_name, li->username,
-	    MIN_SIZEOF(utx->ut_name, li->username));
+	strncpy(utx->ut_user, li->username,
+	    MIN_SIZEOF(utx->ut_user, li->username));
 
 	if (li->type == LTYPE_LOGOUT)
 		return;