mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-25 19:43:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) Replace ut_name with ut_user. Patch from Jim Watt

Browse Source 
<jimw@peisj.pebio.com>
This commit is contained in:
Damien Miller 2000-07-09 21:37:49 +10:00
parent 0100627fc8
commit b38ea86526
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

@ -5,6 +5,8 @@
Problem report from Niklas Edmundsson <nikke@ing.umu.se> Problem report from Niklas Edmundsson <nikke@ing.umu.se>
- (djm) Missing $(DESTDIR) on host-key target causing problems with RPM - (djm) Missing $(DESTDIR) on host-key target causing problems with RPM
builds. Problem report from Gregory Leblanc <GLeblanc@cu-portland.edu> builds. Problem report from Gregory Leblanc <GLeblanc@cu-portland.edu>
- (djm) Replace ut_name with ut_user. Patch from Jim Watt
<jimw@peisj.pebio.com>
20000708 20000708
- (djm) Fix bad fprintf format handling in auth-pam.c. Patch from - (djm) Fix bad fprintf format handling in auth-pam.c. Patch from

8
loginrec.c
View File

@ -170,7 +170,7 @@
#include "xmalloc.h" #include "xmalloc.h"
#include "loginrec.h" #include "loginrec.h"
RCSID("$Id: loginrec.c,v 1.14 2000/07/01 22:43:18 djm Exp $"); RCSID("$Id: loginrec.c,v 1.15 2000/07/09 11:37:49 djm Exp $");
/** /**
** prototypes for helper functions in this file ** prototypes for helper functions in this file
@ -680,7 +680,7 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
*/ */
/* strncpy(): Don't necessarily want null termination */ /* 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));
# ifdef HAVE_HOST_IN_UTMPX # ifdef HAVE_HOST_IN_UTMPX
strncpy(utx->ut_host, li->hostname, MIN_SIZEOF(utx->ut_host, li->hostname)); strncpy(utx->ut_host, li->hostname, MIN_SIZEOF(utx->ut_host, li->hostname));
# endif # endif
@ -740,12 +740,12 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut)
/* /*
* Prevent luser from zero'ing out ut_host. * Prevent luser from zero'ing out ut_host.
* If the new ut_line is empty but the old one is not * If the new ut_line is empty but the old one is not
* and ut_line and ut_name match, preserve the old ut_line. * and ut_line and ut_user match, preserve the old ut_line.
*/ */
if (atomicio(read, fd, &old_ut, sizeof(old_ut)) == sizeof(old_ut) && if (atomicio(read, fd, &old_ut, sizeof(old_ut)) == sizeof(old_ut) &&
(ut->ut_host[0] == '\0') && (old_ut.ut_host[0] != '\0') && (ut->ut_host[0] == '\0') && (old_ut.ut_host[0] != '\0') &&
(strncmp(old_ut.ut_line, ut->ut_line, sizeof(ut->ut_line)) == 0) && (strncmp(old_ut.ut_line, ut->ut_line, sizeof(ut->ut_line)) == 0) &&
(strncmp(old_ut.ut_name, ut->ut_name, sizeof(ut->ut_name)) == 0)) { (strncmp(old_ut.ut_user, ut->ut_user, sizeof(ut->ut_user)) == 0)) {
(void)memcpy(ut->ut_host, old_ut.ut_host, sizeof(ut->ut_host)); (void)memcpy(ut->ut_host, old_ut.ut_host, sizeof(ut->ut_host));
} }