diff options
-rw-r--r-- | CREDITS | 1 | ||||
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | configure.in | 1 | ||||
-rw-r--r-- | loginrec.c | 12 |
4 files changed, 9 insertions, 7 deletions
@@ -47,6 +47,7 @@ Niels Kristian Bech Jensen <nkbj@image.dk> - Assorted patches | |||
47 | Peter Kocks <peter.kocks@baygate.com> - Makefile fixes | 47 | Peter Kocks <peter.kocks@baygate.com> - Makefile fixes |
48 | Phil Hands <phil@hands.com> - Debian scripts, assorted patches | 48 | Phil Hands <phil@hands.com> - Debian scripts, assorted patches |
49 | Phil Karn <karn@ka9q.ampr.org> - Autoconf fix | 49 | Phil Karn <karn@ka9q.ampr.org> - Autoconf fix |
50 | Phill Camp <P.S.S.Camp@ukc.ac.uk> - login code fix | ||
50 | SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp> - Multiple bugfixes | 51 | SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp> - Multiple bugfixes |
51 | Simon Wilkinson <sxw@dcs.ed.ac.uk> - PAM fixes | 52 | Simon Wilkinson <sxw@dcs.ed.ac.uk> - PAM fixes |
52 | Thomas Neumann <tom@smart.ruhr.de> - Shadow passwords | 53 | Thomas Neumann <tom@smart.ruhr.de> - Shadow passwords |
@@ -2,6 +2,8 @@ | |||
2 | - (djm) Fixes from Andrew McGill <andrewm@datrix.co.za>: | 2 | - (djm) Fixes from Andrew McGill <andrewm@datrix.co.za>: |
3 | - Platform define for SCO 3.x which breaks on /dev/ptmx | 3 | - Platform define for SCO 3.x which breaks on /dev/ptmx |
4 | - Detect and try to fix missing MAXPATHLEN | 4 | - Detect and try to fix missing MAXPATHLEN |
5 | - (djm) Fix short copy in loginrec.c (based on patch from Phill Camp | ||
6 | <P.S.S.Camp@ukc.ac.uk> | ||
5 | 7 | ||
6 | 20000612 | 8 | 20000612 |
7 | - (djm) Glob manpages in RPM spec files to catch compressed files | 9 | - (djm) Glob manpages in RPM spec files to catch compressed files |
diff --git a/configure.in b/configure.in index 3bdf41133..0e755e4b7 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1162,4 +1162,3 @@ fi | |||
1162 | 1162 | ||
1163 | AC_OUTPUT(Makefile ssh_prng_cmds) | 1163 | AC_OUTPUT(Makefile ssh_prng_cmds) |
1164 | 1164 | ||
1165 | |||
diff --git a/loginrec.c b/loginrec.c index 00136a952..59ce1808a 100644 --- a/loginrec.c +++ b/loginrec.c | |||
@@ -170,7 +170,7 @@ | |||
170 | #include "xmalloc.h" | 170 | #include "xmalloc.h" |
171 | #include "loginrec.h" | 171 | #include "loginrec.h" |
172 | 172 | ||
173 | RCSID("$Id: loginrec.c,v 1.5 2000/06/12 22:21:44 andre Exp $"); | 173 | RCSID("$Id: loginrec.c,v 1.6 2000/06/13 11:23:17 djm Exp $"); |
174 | 174 | ||
175 | /** | 175 | /** |
176 | ** prototypes for helper functions in this file | 176 | ** prototypes for helper functions in this file |
@@ -438,7 +438,7 @@ line_fullname(char *dst, const char *src, int dstsize) | |||
438 | if ((strncmp(src, "/dev/", 5) == 0) || (dstsize < (strlen(src) + 5))) | 438 | if ((strncmp(src, "/dev/", 5) == 0) || (dstsize < (strlen(src) + 5))) |
439 | strlcpy(dst, src, dstsize); | 439 | strlcpy(dst, src, dstsize); |
440 | else { | 440 | else { |
441 | strlcpy(dst, "/dev/", 5); | 441 | strlcpy(dst, "/dev/", dstsize); |
442 | strlcat(dst, src, dstsize); | 442 | strlcat(dst, src, dstsize); |
443 | } | 443 | } |
444 | return dst; | 444 | return dst; |
@@ -958,9 +958,9 @@ wtmp_get_entry(struct logininfo *li) | |||
958 | li->tv_sec = ut.ut_tv.tv_sec; | 958 | li->tv_sec = ut.ut_tv.tv_sec; |
959 | # endif | 959 | # endif |
960 | #endif | 960 | #endif |
961 | line_fullname(li->line, ut.ut_line, sizeof(ut.ut_line)); | 961 | line_fullname(li->line, ut.ut_line, sizeof(li->line)); |
962 | #ifdef HAVE_HOST_IN_UTMP | 962 | #ifdef HAVE_HOST_IN_UTMP |
963 | strlcpy(li->hostname, ut.ut_host, sizeof(ut.ut_host)); | 963 | strlcpy(li->hostname, ut.ut_host, sizeof(li->hostname)); |
964 | #endif | 964 | #endif |
965 | } | 965 | } |
966 | if (lseek(fd, (off_t)(0-2*sizeof(struct utmp)), SEEK_CUR) == -1) { | 966 | if (lseek(fd, (off_t)(0-2*sizeof(struct utmp)), SEEK_CUR) == -1) { |
@@ -1096,9 +1096,9 @@ wtmpx_get_entry(struct logininfo *li) | |||
1096 | li->tv_sec = utx.ut_time; | 1096 | li->tv_sec = utx.ut_time; |
1097 | # endif | 1097 | # endif |
1098 | #endif | 1098 | #endif |
1099 | line_fullname(li->line, utx.ut_line, sizeof(utx.ut_line)); | 1099 | line_fullname(li->line, utx.ut_line, sizeof(li->line)); |
1100 | #ifdef HAVE_HOST_IN_UTMPX | 1100 | #ifdef HAVE_HOST_IN_UTMPX |
1101 | strlcpy(li->hostname, utx.ut_host, sizeof(utx.ut_line)); | 1101 | strlcpy(li->hostname, utx.ut_host, sizeof(li->hostname)); |
1102 | #endif | 1102 | #endif |
1103 | } | 1103 | } |
1104 | if (lseek(fd, (off_t)(0-2*sizeof(struct utmpx)), SEEK_CUR) == -1) { | 1104 | if (lseek(fd, (off_t)(0-2*sizeof(struct utmpx)), SEEK_CUR) == -1) { |