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

- Fix login.c breakage on systems which lack ut_host in struct 

utmp. Reported by Willard Dawson <willard.dawson@sbs.siemens.com>
This commit is contained in:
Damien Miller 1999-12-22 16:09:48 +11:00
parent 365199d8a5
commit 1b0c228ec4
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,6 +1,8 @@
19991222 19991222
- Fix undefined fd_set type in ssh.h from Povl H. Pedersen - Fix undefined fd_set type in ssh.h from Povl H. Pedersen
<pope@netguide.dk> <pope@netguide.dk>
- Fix login.c breakage on systems which lack ut_host in struct
utmp. Reported by Willard Dawson <willard.dawson@sbs.siemens.com>
19991221 19991221
- Integration of large HPUX patch from Andre Lucas - Integration of large HPUX patch from Andre Lucas

20
login.c
View File

@ -18,7 +18,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: login.c,v 1.9 1999/12/21 10:30:56 damien Exp $"); RCSID("$Id: login.c,v 1.10 1999/12/22 05:09:48 damien Exp $");
#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX) #if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
# include <utmpx.h> # include <utmpx.h>
@ -53,7 +53,7 @@ unsigned long
get_last_login_time(uid_t uid, const char *logname, get_last_login_time(uid_t uid, const char *logname,
char *buf, unsigned int bufsize) char *buf, unsigned int bufsize)
{ {
#if defined(HAVE_LASTLOG_H) && !defined(DISABLE_LASTLOG) #if defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG)
struct lastlog ll; struct lastlog ll;
char *lastlog; char *lastlog;
int fd; int fd;
@ -76,7 +76,7 @@ get_last_login_time(uid_t uid, const char *logname,
buf[bufsize - 1] = 0; buf[bufsize - 1] = 0;
return ll.ll_time; return ll.ll_time;
#else /* defined(HAVE_LASTLOG_H) && !defined(DISABLE_LASTLOG) */ #else /* defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG) */
/* Look in wtmp for the last login */ /* Look in wtmp for the last login */
struct utmp wt; struct utmp wt;
char *wt_file = _PATH_WTMP; char *wt_file = _PATH_WTMP;
@ -101,10 +101,14 @@ get_last_login_time(uid_t uid, const char *logname,
if ( wt.ut_type == USER_PROCESS) { if ( wt.ut_type == USER_PROCESS) {
if ( !strncmp(logname, wt.ut_user, 8) ) { if ( !strncmp(logname, wt.ut_user, 8) ) {
t = (unsigned long) wt.ut_time; t = (unsigned long) wt.ut_time;
#ifdef HAVE_HOST_IN_UTMP
if (bufsize > sizeof(wt.ut_host) + 1) if (bufsize > sizeof(wt.ut_host) + 1)
bufsize = sizeof(wt.ut_host) + 1; bufsize = sizeof(wt.ut_host) + 1;
strncpy(buf, wt.ut_host, bufsize - 1); strncpy(buf, wt.ut_host, bufsize - 1);
buf[bufsize - 1] = 0; buf[bufsize - 1] = 0;
#else /* HAVE_HOST_IN_UTMP */
buf[0] = 0;
#endif /* HAVE_HOST_IN_UTMP */
} }
} }
@ -113,7 +117,7 @@ get_last_login_time(uid_t uid, const char *logname,
} while (t == 0); } while (t == 0);
return t; return t;
#endif /* defined(HAVE_LASTLOG_H) && !defined(DISABLE_LASTLOG) */ #endif /* defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG) */
} }
/* /*
@ -125,10 +129,10 @@ void
record_login(int pid, const char *ttyname, const char *user, uid_t uid, record_login(int pid, const char *ttyname, const char *user, uid_t uid,
const char *host, struct sockaddr_in * addr) const char *host, struct sockaddr_in * addr)
{ {
#if defined(HAVE_LASTLOG_H) && !defined(DISABLE_LASTLOG) #if defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG)
struct lastlog ll; struct lastlog ll;
char *lastlog; char *lastlog;
#endif /* defined(HAVE_LASTLOG_H) && !defined(DISABLE_LASTLOG) */ #endif /* defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG) */
struct UTMP_STR u; struct UTMP_STR u;
const char *utmp, *wtmp; const char *utmp, *wtmp;
@ -152,7 +156,7 @@ record_login(int pid, const char *ttyname, const char *user, uid_t uid,
login(&u); login(&u);
#if defined(HAVE_LASTLOG_H) && !defined(DISABLE_LASTLOG) #if defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG)
lastlog = _PATH_LASTLOG; lastlog = _PATH_LASTLOG;
/* Update lastlog unless actually recording a logout. */ /* Update lastlog unless actually recording a logout. */
@ -176,7 +180,7 @@ record_login(int pid, const char *ttyname, const char *user, uid_t uid,
close(fd); close(fd);
} }
} }
#endif /* defined(HAVE_LASTLOG_H) && !defined(DISABLE_LASTLOG) */ #endif /* defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG) */
} }
/* Records that the user has logged out. */ /* Records that the user has logged out. */