Date: Wed, 6 Jan 2010 07:50:27 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r201632 - user/ed/utmpx/crypto/openssh Message-ID: <201001060750.o067oRLV058865@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001060750.o067oRLV058865>