- (djm) Fix short copy in loginrec.c (based on patch from Phill Camp

<P.S.S.Camp@ukc.ac.uk>
This commit is contained in:
Damien Miller 2000-06-13 21:23:17 +10:00
parent a66626b2d5
commit 1a13225d87
4 changed files with 9 additions and 7 deletions

View File

@ -47,6 +47,7 @@ Niels Kristian Bech Jensen <nkbj@image.dk> - Assorted patches
Peter Kocks <peter.kocks@baygate.com> - Makefile fixes Peter Kocks <peter.kocks@baygate.com> - Makefile fixes
Phil Hands <phil@hands.com> - Debian scripts, assorted patches Phil Hands <phil@hands.com> - Debian scripts, assorted patches
Phil Karn <karn@ka9q.ampr.org> - Autoconf fix Phil Karn <karn@ka9q.ampr.org> - Autoconf fix
Phill Camp <P.S.S.Camp@ukc.ac.uk> - login code fix
SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp> - Multiple bugfixes SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp> - Multiple bugfixes
Simon Wilkinson <sxw@dcs.ed.ac.uk> - PAM fixes Simon Wilkinson <sxw@dcs.ed.ac.uk> - PAM fixes
Thomas Neumann <tom@smart.ruhr.de> - Shadow passwords Thomas Neumann <tom@smart.ruhr.de> - Shadow passwords

View File

@ -2,6 +2,8 @@
- (djm) Fixes from Andrew McGill <andrewm@datrix.co.za>: - (djm) Fixes from Andrew McGill <andrewm@datrix.co.za>:
- Platform define for SCO 3.x which breaks on /dev/ptmx - Platform define for SCO 3.x which breaks on /dev/ptmx
- Detect and try to fix missing MAXPATHLEN - Detect and try to fix missing MAXPATHLEN
- (djm) Fix short copy in loginrec.c (based on patch from Phill Camp
<P.S.S.Camp@ukc.ac.uk>
20000612 20000612
- (djm) Glob manpages in RPM spec files to catch compressed files - (djm) Glob manpages in RPM spec files to catch compressed files

View File

@ -1162,4 +1162,3 @@ fi
AC_OUTPUT(Makefile ssh_prng_cmds) AC_OUTPUT(Makefile ssh_prng_cmds)

View File

@ -170,7 +170,7 @@
#include "xmalloc.h" #include "xmalloc.h"
#include "loginrec.h" #include "loginrec.h"
RCSID("$Id: loginrec.c,v 1.5 2000/06/12 22:21:44 andre Exp $"); RCSID("$Id: loginrec.c,v 1.6 2000/06/13 11:23:17 djm Exp $");
/** /**
** prototypes for helper functions in this file ** prototypes for helper functions in this file
@ -438,7 +438,7 @@ line_fullname(char *dst, const char *src, int dstsize)
if ((strncmp(src, "/dev/", 5) == 0) || (dstsize < (strlen(src) + 5))) if ((strncmp(src, "/dev/", 5) == 0) || (dstsize < (strlen(src) + 5)))
strlcpy(dst, src, dstsize); strlcpy(dst, src, dstsize);
else { else {
strlcpy(dst, "/dev/", 5); strlcpy(dst, "/dev/", dstsize);
strlcat(dst, src, dstsize); strlcat(dst, src, dstsize);
} }
return dst; return dst;
@ -958,9 +958,9 @@ wtmp_get_entry(struct logininfo *li)
li->tv_sec = ut.ut_tv.tv_sec; li->tv_sec = ut.ut_tv.tv_sec;
# endif # endif
#endif #endif
line_fullname(li->line, ut.ut_line, sizeof(ut.ut_line)); line_fullname(li->line, ut.ut_line, sizeof(li->line));
#ifdef HAVE_HOST_IN_UTMP #ifdef HAVE_HOST_IN_UTMP
strlcpy(li->hostname, ut.ut_host, sizeof(ut.ut_host)); strlcpy(li->hostname, ut.ut_host, sizeof(li->hostname));
#endif #endif
} }
if (lseek(fd, (off_t)(0-2*sizeof(struct utmp)), SEEK_CUR) == -1) { if (lseek(fd, (off_t)(0-2*sizeof(struct utmp)), SEEK_CUR) == -1) {
@ -1096,9 +1096,9 @@ wtmpx_get_entry(struct logininfo *li)
li->tv_sec = utx.ut_time; li->tv_sec = utx.ut_time;
# endif # endif
#endif #endif
line_fullname(li->line, utx.ut_line, sizeof(utx.ut_line)); line_fullname(li->line, utx.ut_line, sizeof(li->line));
#ifdef HAVE_HOST_IN_UTMPX #ifdef HAVE_HOST_IN_UTMPX
strlcpy(li->hostname, utx.ut_host, sizeof(utx.ut_line)); strlcpy(li->hostname, utx.ut_host, sizeof(li->hostname));
#endif #endif
} }
if (lseek(fd, (off_t)(0-2*sizeof(struct utmpx)), SEEK_CUR) == -1) { if (lseek(fd, (off_t)(0-2*sizeof(struct utmpx)), SEEK_CUR) == -1) {