tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [loginrec.c] Use the SUSv3 specified name for the user name 

when using utmpx.  Patch from Ed Schouten.
This commit is contained in:
Darren Tucker 2010-01-09 18:18:04 +11:00
parent 11b5c07941
commit 0b8a2262ac
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -3,6 +3,8 @@
have it. have it.
- (dtucker) [defines.h] define PRIu64 for platforms that don't have it. - (dtucker) [defines.h] define PRIu64 for platforms that don't have it.
- (dtucker) [roaming_client.c] Wrap inttypes.h in an ifdef. - (dtucker) [roaming_client.c] Wrap inttypes.h in an ifdef.
- (dtucker) [loginrec.c] Use the SUSv3 specified name for the user name
when using utmpx. Patch from Ed Schouten.
20091208 20091208
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync

8
loginrec.c
View File

@ -758,8 +758,8 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
utx->ut_pid = li->pid; utx->ut_pid = li->pid;
/* strncpy(): Don't necessarily want null termination */ /* strncpy(): Don't necessarily want null termination */
strncpy(utx->ut_name, li->username, strncpy(utx->ut_user, li->username,
MIN_SIZEOF(utx->ut_name, li->username)); MIN_SIZEOF(utx->ut_user, li->username));
if (li->type == LTYPE_LOGOUT) if (li->type == LTYPE_LOGOUT)
return; return;
@ -1316,8 +1316,8 @@ wtmpx_write_entry(struct logininfo *li)
static int static int
wtmpx_islogin(struct logininfo *li, struct utmpx *utx) wtmpx_islogin(struct logininfo *li, struct utmpx *utx)
{ {
if (strncmp(li->username, utx->ut_name, if (strncmp(li->username, utx->ut_user,
MIN_SIZEOF(li->username, utx->ut_name)) == 0 ) { MIN_SIZEOF(li->username, utx->ut_user)) == 0 ) {
# ifdef HAVE_TYPE_IN_UTMPX # ifdef HAVE_TYPE_IN_UTMPX
if (utx->ut_type == USER_PROCESS) if (utx->ut_type == USER_PROCESS)
return (1); return (1);