diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | defines.h | 6 | ||||
-rw-r--r-- | loginrec.c | 6 |
3 files changed, 9 insertions, 7 deletions
@@ -3,6 +3,8 @@ | |||
3 | pty name on Linux 2.6.x systems. Patch from jpe at eisenmenger.org. | 3 | pty name on Linux 2.6.x systems. Patch from jpe at eisenmenger.org. |
4 | - (bal) [monitor.c monitor_wrap.c] Second try. Put the zlib.h headers | 4 | - (bal) [monitor.c monitor_wrap.c] Second try. Put the zlib.h headers |
5 | back and #undef TARGET_OS_MAC instead. (Bug report pending with Apple) | 5 | back and #undef TARGET_OS_MAC instead. (Bug report pending with Apple) |
6 | - (dtucker) [defines.h loginrec.c] Define UT_LINESIZE if not defined and | ||
7 | simplify loginrec.c. ok tim@ | ||
6 | 8 | ||
7 | 20040407 | 9 | 20040407 |
8 | - (dtucker) [session.c] Flush stdout after displaying loginmsg. From | 10 | - (dtucker) [session.c] Flush stdout after displaying loginmsg. From |
@@ -953,4 +955,4 @@ | |||
953 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 955 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
954 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 956 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
955 | 957 | ||
956 | $Id: ChangeLog,v 1.3305 2004/04/08 05:11:03 mouring Exp $ | 958 | $Id: ChangeLog,v 1.3306 2004/04/08 06:16:06 dtucker Exp $ |
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _DEFINES_H | 25 | #ifndef _DEFINES_H |
26 | #define _DEFINES_H | 26 | #define _DEFINES_H |
27 | 27 | ||
28 | /* $Id: defines.h,v 1.112 2004/04/06 11:31:13 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.113 2004/04/08 06:16:06 dtucker Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -615,6 +615,10 @@ struct winsize { | |||
615 | 615 | ||
616 | #endif | 616 | #endif |
617 | 617 | ||
618 | #ifndef UT_LINESIZE | ||
619 | # define UT_LINESIZE 8 | ||
620 | #endif | ||
621 | |||
618 | /* I hope that the presence of LASTLOG_FILE is enough to detect this */ | 622 | /* I hope that the presence of LASTLOG_FILE is enough to detect this */ |
619 | #if defined(LASTLOG_FILE) && !defined(DISABLE_LASTLOG) | 623 | #if defined(LASTLOG_FILE) && !defined(DISABLE_LASTLOG) |
620 | # define USE_LASTLOG | 624 | # define USE_LASTLOG |
diff --git a/loginrec.c b/loginrec.c index 9a9ad66a0..b74d412e6 100644 --- a/loginrec.c +++ b/loginrec.c | |||
@@ -158,7 +158,7 @@ | |||
158 | #include "log.h" | 158 | #include "log.h" |
159 | #include "atomicio.h" | 159 | #include "atomicio.h" |
160 | 160 | ||
161 | RCSID("$Id: loginrec.c,v 1.55 2004/04/08 00:57:05 dtucker Exp $"); | 161 | RCSID("$Id: loginrec.c,v 1.56 2004/04/08 06:16:06 dtucker Exp $"); |
162 | 162 | ||
163 | #ifdef HAVE_UTIL_H | 163 | #ifdef HAVE_UTIL_H |
164 | # include <util.h> | 164 | # include <util.h> |
@@ -1354,11 +1354,7 @@ static int | |||
1354 | syslogin_perform_logout(struct logininfo *li) | 1354 | syslogin_perform_logout(struct logininfo *li) |
1355 | { | 1355 | { |
1356 | # ifdef HAVE_LOGOUT | 1356 | # ifdef HAVE_LOGOUT |
1357 | # ifdef UT_LINESIZE | ||
1358 | char line[UT_LINESIZE]; | 1357 | char line[UT_LINESIZE]; |
1359 | # else | ||
1360 | char line[8]; | ||
1361 | # endif | ||
1362 | 1358 | ||
1363 | (void)line_stripname(line, li->line, sizeof(line)); | 1359 | (void)line_stripname(line, li->line, sizeof(line)); |
1364 | 1360 | ||