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

- (djm) Formatting

This commit is contained in:
Damien Miller 2000-06-27 11:18:27 +10:00
parent f8af08d7cb
commit dd47aa21fa
3 changed files with 147 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,5 +1,6 @@
20000627
- (djm) Fixes to login code - not setting li->uid, cleanups
- (djm) Formatting
20000626
- (djm) Better fix to aclocal tests from Garrick James <garrick@james.net>

185
loginrec.c
View File

@ -170,7 +170,7 @@
#include "xmalloc.h"
#include "loginrec.h"
RCSID("$Id: loginrec.c,v 1.10 2000/06/26 23:40:06 djm Exp $");
RCSID("$Id: loginrec.c,v 1.11 2000/06/27 01:18:27 djm Exp $");
/**
** prototypes for helper functions in this file
@ -237,7 +237,6 @@ login_logout(struct logininfo *li)
return login_write(li);
}
/* login_get_lastlog_time(int) - Retrieve the last login time
*
* Retrieve the last login time for the given uid. Will try to use the
@ -294,14 +293,18 @@ login_get_lastlog(struct logininfo *li, const int uid)
* reliably search wtmp(x) for the last login (see
* wtmp_get_entry().) */
pw = getpwuid(uid);
if (pw == NULL)
fatal("login_get_lastlog: Cannot find account for uid %i", uid);
/* No MIN_SIZEOF here - we absolutely *must not* truncate the
* username */
strlcpy(li->username, pw->pw_name, sizeof(li->username));
#endif
if (getlast_entry(li))
return li;
else
return 0;
return NULL;
}
@ -348,7 +351,6 @@ login_init_entry(struct logininfo *li, int pid, const char *username,
{
struct passwd *pw;
/* zero the structure */
memset(li, 0, sizeof(struct logininfo));
li->pid = pid;
@ -364,6 +366,7 @@ login_init_entry(struct logininfo *li, int pid, const char *username,
fatal("login_init_entry: Cannot find user \"%s\"", li->username);
li->uid = pw->pw_uid;
}
if (hostname)
strlcpy(li->hostname, hostname, sizeof(li->hostname));
@ -387,7 +390,6 @@ login_set_current_time(struct logininfo *li)
li->tv_usec = tv.tv_usec;
}
/* copy a sockaddr_* into our logininfo */
void
login_set_addr(struct logininfo *li, const struct sockaddr *sa,
@ -407,7 +409,6 @@ login_set_addr(struct logininfo *li, const struct sockaddr *sa,
** login_write: Call low-level recording functions based on autoconf
** results
**/
int
login_write (struct logininfo *li)
{
@ -415,6 +416,7 @@ login_write (struct logininfo *li)
log("Attempt to write login records by non-root user (aborting)");
return 1;
}
/* set the timestamp */
login_set_current_time(li);
#ifdef USE_LOGIN
@ -440,7 +442,6 @@ login_write (struct logininfo *li)
return 0;
}
/**
** getlast_entry: Call low-level functions to retrieve the last login
** time.
@ -455,45 +456,29 @@ getlast_entry(struct logininfo *li)
return 1;
else
return 0;
#else
/* !USE_LASTLOG */
#else /* !USE_LASTLOG */
#ifdef DISABLE_LASTLOG
/* On some systems we shouldn't even try to obtain last login
* time, e.g. AIX */
return 0;
# else
# else /* DISABLE_LASTLOG */
/* Try to retrieve the last login time from wtmp */
# if defined(USE_WTMP) && (defined(HAVE_TIME_IN_UTMP) || defined(HAVE_TV_IN_UTMP))
/* retrieve last login time from utmp */
if (wtmp_get_entry(li))
return 1;
else
return 0;
# else
return (wtmp_get_entry(li));
# else /* defined(USE_WTMP) && (defined(HAVE_TIME_IN_UTMP) || defined(HAVE_TV_IN_UTMP)) */
/* If wtmp isn't available, try wtmpx */
# if defined(USE_WTMPX) && (defined(HAVE_TIME_IN_UTMPX) || defined(HAVE_TV_IN_UTMPX))
/* retrieve last login time from utmpx */
if (wtmpx_get_entry(li))
return 1;
else
return 0;
return (wtmpx_get_entry(li));
# else
/* Give up: No means of retrieving last login time */
return 0;
# endif
/* USE_WTMPX && (HAVE_TIME_IN_UTMPX || HAVE_TV_IN_UTMPX) */
# endif
/* USE_WTMP && (HAVE_TIME_IN_UTMP || HAVE_TV_IN_UTMP) */
# endif
/* DISABLE_LASTLOG */
#endif
/* USE_LASTLOG */
# endif /* USE_WTMPX && (HAVE_TIME_IN_UTMPX || HAVE_TV_IN_UTMPX) */
# endif /* USE_WTMP && (HAVE_TIME_IN_UTMP || HAVE_TV_IN_UTMP) */
# endif /* DISABLE_LASTLOG */
#endif /* USE_LASTLOG */
}
@ -530,7 +515,6 @@ line_fullname(char *dst, const char *src, int dstsize)
return dst;
}
/* line_stripname(): strip the leading '/dev' if it exists, return dst */
char *
line_stripname(char *dst, const char *src, int dstsize)
@ -543,7 +527,6 @@ line_stripname(char *dst, const char *src, int dstsize)
return dst;
}
/* line_abbrevname(): Return the abbreviated (usually four-character)
* form of the line (Just use the last <dstsize> characters of the
* full name.)
@ -551,13 +534,21 @@ line_stripname(char *dst, const char *src, int dstsize)
* NOTE: use strncpy because we do NOT necessarily want zero
* termination */
char *
line_abbrevname(char *dst, const char *src, int dstsize) {
line_abbrevname(char *dst, const char *src, int dstsize)
{
size_t len;
memset(dst, '\0', dstsize);
src += (strlen(src) - dstsize);
len = strlen(src);
if (len <= 0) {
src += (len - dstsize);
strncpy(dst, src, dstsize); /* note: _don't_ change this to strlcpy */
return dst;
}
return dst;
}
/**
** utmp utility functions
@ -582,7 +573,6 @@ set_utmp_time(struct logininfo *li, struct utmp *ut)
# endif
}
void
construct_utmp(struct logininfo *li,
struct utmp *ut)
@ -609,6 +599,7 @@ construct_utmp(struct logininfo *li,
set_utmp_time(li, ut);
line_stripname(ut->ut_line, li->line, sizeof(ut->ut_line));
# ifdef HAVE_PID_IN_UTMP
ut->ut_pid = li->pid;
# endif
@ -617,8 +608,10 @@ construct_utmp(struct logininfo *li,
if (li->type == LTYPE_LOGOUT)
return;
/* These fields are only used when logging in, and are blank
* for logouts. */
/*
* These fields are only used when logging in, and are blank
* for logouts.
*/
/* Use strncpy because we don't necessarily want null termination */
strncpy(ut->ut_user, li->username, MIN_SIZEOF(ut->ut_user, li->username));
@ -631,11 +624,7 @@ construct_utmp(struct logininfo *li,
ut->ut_addr = li->hostaddr.sa_in.sin_addr.s_addr;
# endif
}
#endif
/* USE_UTMP || USE_WTMP || USE_LOGIN */
#endif /* USE_UTMP || USE_WTMP || USE_LOGIN */
/**
** utmpx utility functions
@ -645,7 +634,6 @@ construct_utmp(struct logininfo *li,
**/
#if defined(USE_UTMPX) || defined (USE_WTMPX)
/* build the utmpx structure */
void
set_utmpx_time(struct logininfo *li, struct utmpx *utx)
@ -653,14 +641,13 @@ set_utmpx_time(struct logininfo *li, struct utmpx *utx)
# ifdef HAVE_TV_IN_UTMPX
utx->ut_tv.tv_sec = li->tv_sec;
utx->ut_tv.tv_usec = li->tv_usec;
#else
# else /* HAVE_TV_IN_UTMPX */
# ifdef HAVE_TIME_IN_UTMPX
utx->ut_time = li->tv_sec;
# endif
#endif
# endif /* HAVE_TIME_IN_UTMPX */
# endif /* HAVE_TV_IN_UTMPX */
}
void
construct_utmpx(struct logininfo *li, struct utmpx *utx)
{
@ -683,8 +670,10 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
if (li->type == LTYPE_LOGOUT)
return;
/* These fields are only used when logging in, and are blank
* for logouts. */
/*
* These fields are only used when logging in, and are blank
* for logouts.
*/
/* strncpy(): Don't necessarily want null termination */
strncpy(utx->ut_name, li->username, MIN_SIZEOF(utx->ut_name, li->username));
@ -699,18 +688,13 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
utx->ut_syslen = MIN(strlen(li->hostname), sizeof(utx->ut_host));
# endif
}
#endif
/* USE_UTMPX || USE_WTMPX */
#endif /* USE_UTMPX || USE_WTMPX */
/**
** Low-level utmp functions
**/
/* FIXME: (ATL) utmp_write_direct needs testing */
#ifdef USE_UTMP
/* if we can, use pututline() etc. */
@ -733,8 +717,7 @@ utmp_write_library(struct logininfo *li, struct utmp *ut)
# endif
return 1;
}
#else
# else /* UTMP_USE_LIBRARY */
/* write a utmp entry direct to the file */
/* This is a slightly modification of code in OpenBSD's login.c */
@ -774,7 +757,6 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut)
}
# endif /* UTMP_USE_LIBRARY */
static int
utmp_perform_login(struct logininfo *li)
{
@ -832,10 +814,7 @@ utmp_write_entry(struct logininfo *li)
return 0;
}
}
#endif
/* USE_UTMP */
#endif /* USE_UTMP */
/**
@ -846,8 +825,8 @@ utmp_write_entry(struct logininfo *li)
#ifdef USE_UTMPX
/* if we have the wherewithall, use pututxline etc. */
#if !defined(DISABLE_PUTUTXLINE) && defined(HAVE_SETUTXENT) \
&& defined(HAVE_PUTUTXLINE)
# if !defined(DISABLE_PUTUTXLINE) && defined(HAVE_SETUTXENT) && \
defined(HAVE_PUTUTXLINE)
# define UTMPX_USE_LIBRARY
# endif
@ -866,9 +845,7 @@ utmpx_write_library(struct logininfo *li, struct utmpx *utx)
return 1;
}
#else
/* UTMPX_USE_LIBRARY */
# else /* UTMPX_USE_LIBRARY */
/* write a utmp entry direct to the file */
static int
@ -877,9 +854,7 @@ utmpx_write_direct(struct logininfo *li, struct utmpx *utx)
log("utmpx_write_direct: not implemented!");
return 0;
}
#endif
/* UTMPX_USE_LIBRARY */
# endif /* UTMPX_USE_LIBRARY */
static int
utmpx_perform_login(struct logininfo *li)
@ -925,7 +900,6 @@ utmpx_perform_logout(struct logininfo *li)
return 1;
}
int
utmpx_write_entry(struct logininfo *li)
{
@ -939,10 +913,7 @@ utmpx_write_entry(struct logininfo *li)
return 0;
}
}
#endif
/* USE_UTMPX */
#endif /* USE_UTMPX */
/**
@ -976,9 +947,9 @@ wtmp_write(struct logininfo *li, struct utmp *ut)
return ret;
}
static int
wtmp_perform_login(struct logininfo *li){
wtmp_perform_login(struct logininfo *li)
{
struct utmp ut;
construct_utmp(li, &ut);
@ -1027,7 +998,6 @@ wtmp_write_entry(struct logininfo *li)
* place and not have ut_type.
*/
/* return true if this wtmp entry indicates a login */
static int
wtmp_islogin(struct logininfo *li, struct utmp *ut)
@ -1044,7 +1014,6 @@ wtmp_islogin(struct logininfo *li, struct utmp *ut)
return 0;
}
int
wtmp_get_entry(struct logininfo *li)
{
@ -1112,10 +1081,7 @@ wtmp_get_entry(struct logininfo *li)
close(fd);
return 1;
}
#endif
/* USE_WTMP */
# endif /* USE_WTMP */
/**
@ -1123,7 +1089,6 @@ wtmp_get_entry(struct logininfo *li)
**/
#ifdef USE_WTMPX
/* write a wtmpx entry direct to the end of the file */
/* This is a slight modification of code in OpenBSD's logwtmp.c */
static int
@ -1268,17 +1233,13 @@ wtmpx_get_entry(struct logininfo *li)
close(fd);
return 1;
}
#endif /* USE_WTMPX */
/**
** Low-level libutil login() functions
**/
#ifdef USE_LOGIN
static int
syslogin_perform_login(struct logininfo *li)
{
@ -1294,7 +1255,6 @@ syslogin_perform_login(struct logininfo *li)
return 1;
}
static int
syslogin_perform_logout(struct logininfo *li)
{
@ -1318,7 +1278,6 @@ syslogin_perform_logout(struct logininfo *li)
return 1;
}
int
syslogin_write_entry(struct logininfo *li)
{
@ -1332,18 +1291,18 @@ syslogin_write_entry(struct logininfo *li)
return 0;
}
}
#endif /* USE_LOGIN */
/* end of file log-syslogin.c */
/**
** Low-level lastlog functions
**/
#ifdef USE_LASTLOG
#define LL_FILE 1
#define LL_DIR 2
#define LL_OTHER 3
static void
lastlog_construct(struct logininfo *li, struct lastlog *last)
@ -1351,26 +1310,20 @@ lastlog_construct(struct logininfo *li, struct lastlog *last)
/* clear the structure */
memset(last, '\0', sizeof(struct lastlog));
(void)line_stripname(last->ll_line, li->line,
sizeof(last->ll_line));
(void)line_stripname(last->ll_line, li->line, sizeof(last->ll_line));
strlcpy(last->ll_host, li->hostname,
MIN_SIZEOF(last->ll_host, li->hostname));
last->ll_time = li->tv_sec;
}
#define LL_FILE 1
#define LL_DIR 2
#define LL_OTHER 3
static int
lastlog_filetype(char *filename)
{
struct stat st;
if (stat(LASTLOG_FILE, &st) != 0) {
log("lastlog_perform_login: Couldn't stat %s: %s",
LASTLOG_FILE, strerror(errno));
log("lastlog_perform_login: Couldn't stat %s: %s", LASTLOG_FILE,
strerror(errno));
return 0;
}
if (S_ISDIR(st.st_mode))
@ -1403,7 +1356,7 @@ lastlog_openseek(struct logininfo *li, int *fd, int filemode)
log("lastlog_openseek: %.100s is not a file or directory!",
LASTLOG_FILE);
return 0;
} /* switch */
}
*fd = open(lastlog_file, filemode);
if ( *fd < 0) {
@ -1411,6 +1364,7 @@ lastlog_openseek(struct logininfo *li, int *fd, int filemode)
lastlog_file, strerror(errno));
return 0;
}
/* find this uid's offset in the lastlog file */
offset = (off_t) ( (long)li->uid * sizeof(struct lastlog));
@ -1433,17 +1387,17 @@ lastlog_perform_login(struct logininfo *li)
/* write the entry */
if (lastlog_openseek(li, &fd, O_RDWR)) {
if ( write(fd, &last, sizeof(struct lastlog))
!= sizeof(struct lastlog) ) {
if (write(fd, &last, sizeof(struct lastlog)) !=
sizeof(struct lastlog)) {
log("lastlog_write_filemode: Error writing to %s: %s",
LASTLOG_FILE, strerror(errno));
return 0;
}
return 1;
} else
} else {
return 0;
}
}
int
lastlog_write_entry(struct logininfo *li)
@ -1457,7 +1411,6 @@ lastlog_write_entry(struct logininfo *li)
}
}
static void
lastlog_populate_entry(struct logininfo *li, struct lastlog *last)
{
@ -1467,7 +1420,6 @@ lastlog_populate_entry(struct logininfo *li, struct lastlog *last)
li->tv_sec = last->ll_time;
}
int
lastlog_get_entry(struct logininfo *li)
{
@ -1475,8 +1427,8 @@ lastlog_get_entry(struct logininfo *li)
int fd;
if (lastlog_openseek(li, &fd, O_RDONLY)) {
if ( read(fd, &last, sizeof(struct lastlog))
!= sizeof(struct lastlog) ) {
if ( read(fd, &last, sizeof(struct lastlog)) !=
sizeof(struct lastlog) ) {
log("lastlog_write_filemode: Error reading from %s: %s",
LASTLOG_FILE, strerror(errno));
return 0;
@ -1484,9 +1436,8 @@ lastlog_get_entry(struct logininfo *li)
lastlog_populate_entry(li, &last);
return 1;
}
} else
} else {
return 0;
}
}
#endif /* USE_LASTLOG */

13
loginrec.h
View File

@ -40,7 +40,7 @@
#include <netinet/in.h>
#include <sys/socket.h>
/* RCSID("$Id: loginrec.h,v 1.3 2000/06/19 08:20:03 andre Exp $"); */
/* RCSID("$Id: loginrec.h,v 1.4 2000/06/27 01:18:27 djm Exp $"); */
/**
** you should use the login_* calls to work around platform dependencies
@ -56,11 +56,9 @@ union login_netinfo {
struct sockaddr_storage sa_storage;
};
/*
* * logininfo structure *
*/
/* types - different to utmp.h 'type' macros */
/* (though set to the same value as linux, openbsd and others...) */
#define LTYPE_LOGIN 7
@ -73,32 +71,25 @@ union login_netinfo {
#define LINFO_HOSTSIZE 256
struct logininfo {
char progname[LINFO_PROGSIZE]; /* name of program (for PAM) */
int progname_null;
short int type; /* type of login (LTYPE_*) */
int pid; /* PID of login process */
int uid; /* UID of this user */
char line[LINFO_LINESIZE]; /* tty/pty name */
char username[LINFO_NAMESIZE]; /* login username */
char hostname[LINFO_HOSTSIZE]; /* remote hostname */
/* 'exit_status' structure components */
int exit; /* process exit status */
int termination; /* process termination status */
/* struct timeval (sys/time.h) isn't always available, if it isn't we'll
* use time_t's value as tv_sec and set tv_usec to 0
*/
unsigned int tv_sec;
unsigned int tv_usec;
union login_netinfo hostaddr; /* caller's host address(es) */
}; /* struct logininfo */
/*
* login recording functions
*/
@ -143,6 +134,4 @@ char *line_fullname(char *dst, const char *src, int dstsize);
char *line_stripname(char *dst, const char *src, int dstsize);
char *line_abbrevname(char *dst, const char *src, int dstsize);
#endif /* _HAVE_LOGINREC_H_ */