* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Markus Friedl.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- * The btmp logging code is derived from login.c from util-linux and is under
- * the the following license:
- *
- * Copyright (c) 1980, 1987, 1988 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley. The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-
/**
** loginrec.c: platform-independent login recording and lastlog retrieval
**/
/*
- * The new login code explained
- * ============================
- *
- * This code attempts to provide a common interface to login recording
- * (utmp and friends) and last login time retrieval.
- *
- * Its primary means of achieving this is to use 'struct logininfo', a
- * union of all the useful fields in the various different types of
- * system login record structures one finds on UNIX variants.
- *
- * We depend on autoconf to define which recording methods are to be
- * used, and which fields are contained in the relevant data structures
- * on the local system. Many C preprocessor symbols affect which code
- * gets compiled here.
- *
- * The code is designed to make it easy to modify a particular
- * recording method, without affecting other methods nor requiring so
- * many nested conditional compilation blocks as were commonplace in
- * the old code.
- *
- * For login recording, we try to use the local system's libraries as
- * these are clearly most likely to work correctly. For utmp systems
- * this usually means login() and logout() or setutent() etc., probably
- * in libutil, along with logwtmp() etc. On these systems, we fall back
- * to writing the files directly if we have to, though this method
- * requires very thorough testing so we do not corrupt local auditing
- * information. These files and their access methods are very system
- * specific indeed.
- *
- * For utmpx systems, the corresponding library functions are
- * setutxent() etc. To the author's knowledge, all utmpx systems have
- * these library functions and so no direct write is attempted. If such
- * a system exists and needs support, direct analogues of the [uw]tmp
- * code should suffice.
- *
- * Retrieving the time of last login ('lastlog') is in some ways even
- * more problemmatic than login recording. Some systems provide a
- * simple table of all users which we seek based on uid and retrieve a
- * relatively standard structure. Others record the same information in
- * a directory with a separate file, and others don't record the
- * information separately at all. For systems in the latter category,
- * we look backwards in the wtmp or wtmpx file for the last login entry
- * for our user. Naturally this is slower and on busy systems could
- * incur a significant performance penalty.
- *
- * Calling the new code
- * --------------------
- *
- * In OpenSSH all login recording and retrieval is performed in
- * login.c. Here you'll find working examples. Also, in the logintest.c
- * program there are more examples.
- *
- * Internal handler calling method
- * -------------------------------
- *
- * When a call is made to login_login() or login_logout(), both
- * routines set a struct logininfo flag defining which action (log in,
- * or log out) is to be taken. They both then call login_write(), which
- * calls whichever of the many structure-specific handlers autoconf
- * selects for the local system.
- *
- * The handlers themselves handle system data structure specifics. Both
- * struct utmp and struct utmpx have utility functions (see
- * construct_utmp*()) to try to make it simpler to add extra systems
- * that introduce new features to either structure.
- *
- * While it may seem terribly wasteful to replicate so much similar
- * code for each method, experience has shown that maintaining code to
- * write both struct utmp and utmpx in one function, whilst maintaining
- * support for all systems whether they have library support or not, is
- * a difficult and time-consuming task.
- *
- * Lastlog support proceeds similarly. Functions login_get_lastlog()
- * (and its OpenSSH-tuned friend login_get_lastlog_time()) call
- * getlast_entry(), which tries one of three methods to find the last
- * login time. It uses local system lastlog support if it can,
- * otherwise it tries wtmp or wtmpx before giving up and returning 0,
- * meaning "tilt".
- *
- * Maintenance
- * -----------
- *
- * In many cases it's possible to tweak autoconf to select the correct
- * methods for a particular platform, either by improving the detection
- * code (best), or by presetting DISABLE_<method> or CONF_<method>_FILE
- * symbols for the platform.
- *
- * Use logintest to check which symbols are defined before modifying
- * configure.ac and loginrec.c. (You have to build logintest yourself
- * with 'make logintest' as it's not built by default.)
- *
- * Otherwise, patches to the specific method(s) are very helpful!
- */
+ The new login code explained
+ ============================
+
+ This code attempts to provide a common interface to login recording
+ (utmp and friends) and last login time retrieval.
+
+ Its primary means of achieving this is to use 'struct logininfo', a
+ union of all the useful fields in the various different types of
+ system login record structures one finds on UNIX variants.
+
+ We depend on autoconf to define which recording methods are to be
+ used, and which fields are contained in the relevant data structures
+ on the local system. Many C preprocessor symbols affect which code
+ gets compiled here.
+
+ The code is designed to make it easy to modify a particular
+ recording method, without affecting other methods nor requiring so
+ many nested conditional compilation blocks as were commonplace in
+ the old code.
+
+ For login recording, we try to use the local system's libraries as
+ these are clearly most likely to work correctly. For utmp systems
+ this usually means login() and logout() or setutent() etc., probably
+ in libutil, along with logwtmp() etc. On these systems, we fall back
+ to writing the files directly if we have to, though this method
+ requires very thorough testing so we do not corrupt local auditing
+ information. These files and their access methods are very system
+ specific indeed.
+
+ For utmpx systems, the corresponding library functions are
+ setutxent() etc. To the author's knowledge, all utmpx systems have
+ these library functions and so no direct write is attempted. If such
+ a system exists and needs support, direct analogues of the [uw]tmp
+ code should suffice.
+
+ Retrieving the time of last login ('lastlog') is in some ways even
+ more problemmatic than login recording. Some systems provide a
+ simple table of all users which we seek based on uid and retrieve a
+ relatively standard structure. Others record the same information in
+ a directory with a separate file, and others don't record the
+ information separately at all. For systems in the latter category,
+ we look backwards in the wtmp or wtmpx file for the last login entry
+ for our user. Naturally this is slower and on busy systems could
+ incur a significant performance penalty.
+
+ Calling the new code
+ --------------------
+
+ In OpenSSH all login recording and retrieval is performed in
+ login.c. Here you'll find working examples. Also, in the logintest.c
+ program there are more examples.
+
+ Internal handler calling method
+ -------------------------------
+
+ When a call is made to login_login() or login_logout(), both
+ routines set a struct logininfo flag defining which action (log in,
+ or log out) is to be taken. They both then call login_write(), which
+ calls whichever of the many structure-specific handlers autoconf
+ selects for the local system.
+
+ The handlers themselves handle system data structure specifics. Both
+ struct utmp and struct utmpx have utility functions (see
+ construct_utmp*()) to try to make it simpler to add extra systems
+ that introduce new features to either structure.
+
+ While it may seem terribly wasteful to replicate so much similar
+ code for each method, experience has shown that maintaining code to
+ write both struct utmp and utmpx in one function, whilst maintaining
+ support for all systems whether they have library support or not, is
+ a difficult and time-consuming task.
+
+ Lastlog support proceeds similarly. Functions login_get_lastlog()
+ (and its OpenSSH-tuned friend login_get_lastlog_time()) call
+ getlast_entry(), which tries one of three methods to find the last
+ login time. It uses local system lastlog support if it can,
+ otherwise it tries wtmp or wtmpx before giving up and returning 0,
+ meaning "tilt".
+
+ Maintenance
+ -----------
+
+ In many cases it's possible to tweak autoconf to select the correct
+ methods for a particular platform, either by improving the detection
+ code (best), or by presetting DISABLE_<method> or CONF_<method>_FILE
+ symbols for the platform.
+
+ Use logintest to check which symbols are defined before modifying
+ configure.ac and loginrec.c. (You have to build logintest yourself
+ with 'make logintest' as it's not built by default.)
+
+ Otherwise, patches to the specific method(s) are very helpful!
+
+*/
+
+/**
+ ** TODO:
+ ** homegrown ttyslot()
+ ** test, test, test
+ **
+ ** Platform status:
+ ** ----------------
+ **
+ ** Known good:
+ ** Linux (Redhat 6.2, Debian)
+ ** Solaris
+ ** HP-UX 10.20 (gcc only)
+ ** IRIX
+ ** NeXT - M68k/HPPA/Sparc (4.2/3.3)
+ **
+ ** Testing required: Please send reports!
+ ** NetBSD
+ ** HP-UX 11
+ ** AIX
+ **
+ ** Platforms with known problems:
+ ** Some variants of Slackware Linux
+ **
+ **/
#include "includes.h"
#include "loginrec.h"
#include "log.h"
#include "atomicio.h"
-#include "packet.h"
-#include "canohost.h"
-#include "auth.h"
-#include "buffer.h"
+
+RCSID("$Id$");
#ifdef HAVE_UTIL_H
-# include <util.h>
+# include <util.h>
#endif
#ifdef HAVE_LIBUTIL_H
-# include <libutil.h>
+# include <libutil.h>
#endif
-RCSID("$Id$");
-
/**
** prototypes for helper functions in this file
**/
int wtmp_get_entry(struct logininfo *li);
int wtmpx_get_entry(struct logininfo *li);
-extern Buffer loginmsg;
-
/* pick the shortest string */
-#define MIN_SIZEOF(s1,s2) (sizeof(s1) < sizeof(s2) ? sizeof(s1) : sizeof(s2))
+#define MIN_SIZEOF(s1,s2) ( sizeof(s1) < sizeof(s2) ? sizeof(s1) : sizeof(s2) )
/**
** platform-independent login functions
**/
-/*
- * login_login(struct logininfo *) - Record a login
+/* login_login(struct logininfo *) -Record a login
*
* Call with a pointer to a struct logininfo initialised with
* login_init_entry() or login_alloc_entry()
* 0 on failure (will use OpenSSH's logging facilities for diagnostics)
*/
int
-login_login(struct logininfo *li)
+login_login (struct logininfo *li)
{
li->type = LTYPE_LOGIN;
- return (login_write(li));
+ return login_write(li);
}
-/*
- * login_logout(struct logininfo *) - Record a logout
+/* login_logout(struct logininfo *) - Record a logout
*
* Call as with login_login()
*
login_logout(struct logininfo *li)
{
li->type = LTYPE_LOGOUT;
- return (login_write(li));
+ return login_write(li);
}
-/*
- * login_get_lastlog_time(int) - Retrieve the last login time
+/* login_get_lastlog_time(int) - Retrieve the last login time
*
* Retrieve the last login time for the given uid. Will try to use the
* system lastlog facilities if they are available, but will fall back
struct logininfo li;
if (login_get_lastlog(&li, uid))
- return (li.tv_sec);
+ return li.tv_sec;
else
- return (0);
+ return 0;
}
-/*
- * login_get_lastlog(struct logininfo *, int) - Retrieve a lastlog entry
+/* login_get_lastlog(struct logininfo *, int) - Retrieve a lastlog entry
*
* Retrieve a logininfo structure populated (only partially) with
* information from the system lastlog data, or from wtmp/wtmpx if no
* Returns:
* >0: A pointer to your struct logininfo if successful
* 0 on failure (will use OpenSSH's logging facilities for diagnostics)
+ *
*/
struct logininfo *
login_get_lastlog(struct logininfo *li, const int uid)
*/
pw = getpwuid(uid);
if (pw == NULL)
- fatal("%s: Cannot find account for uid %i", __func__, uid);
+ fatal("login_get_lastlog: Cannot find account for uid %i", uid);
/* No MIN_SIZEOF here - we absolutely *must not* truncate the
- * username (XXX - so check for trunc!) */
+ * username */
strlcpy(li->username, pw->pw_name, sizeof(li->username));
if (getlast_entry(li))
- return (li);
+ return li;
else
- return (NULL);
+ return NULL;
}
-/*
- * login_alloc_entry(int, char*, char*, char*) - Allocate and initialise
+/* login_alloc_entry(int, char*, char*, char*) - Allocate and initialise
* a logininfo structure
*
* This function creates a new struct logininfo, a data structure
*/
struct
logininfo *login_alloc_entry(int pid, const char *username,
- const char *hostname, const char *line)
+ const char *hostname, const char *line)
{
struct logininfo *newli;
- newli = xmalloc(sizeof(*newli));
- login_init_entry(newli, pid, username, hostname, line);
- return (newli);
+ newli = (struct logininfo *) xmalloc (sizeof(*newli));
+ (void)login_init_entry(newli, pid, username, hostname, line);
+ return newli;
}
*/
int
login_init_entry(struct logininfo *li, int pid, const char *username,
- const char *hostname, const char *line)
+ const char *hostname, const char *line)
{
struct passwd *pw;
if (username) {
strlcpy(li->username, username, sizeof(li->username));
pw = getpwnam(li->username);
- if (pw == NULL) {
- fatal("%s: Cannot find user \"%s\"", __func__,
- li->username);
- }
+ if (pw == NULL)
+ fatal("login_init_entry: Cannot find user \"%s\"", li->username);
li->uid = pw->pw_uid;
}
if (hostname)
strlcpy(li->hostname, hostname, sizeof(li->hostname));
- return (1);
+ return 1;
}
-/*
- * login_set_current_time(struct logininfo *) - set the current time
+/* login_set_current_time(struct logininfo *) - set the current time
*
* Set the current time in a logininfo structure. This function is
* meant to eliminate the need to deal with system dependencies for
/* copy a sockaddr_* into our logininfo */
void
login_set_addr(struct logininfo *li, const struct sockaddr *sa,
- const unsigned int sa_size)
+ const unsigned int sa_size)
{
unsigned int bufsize = sa_size;
if (sizeof(li->hostaddr) < sa_size)
bufsize = sizeof(li->hostaddr);
- memcpy(&li->hostaddr.sa, sa, bufsize);
+ memcpy((void *)&(li->hostaddr.sa), (const void *)sa, bufsize);
}
** results
**/
int
-login_write(struct logininfo *li)
+login_write (struct logininfo *li)
{
#ifndef HAVE_CYGWIN
- if (geteuid() != 0) {
- logit("Attempt to write login records by non-root user (aborting)");
- return (1);
+ if ((int)geteuid() != 0) {
+ log("Attempt to write login records by non-root user (aborting)");
+ return 1;
}
#endif
syslogin_write_entry(li);
#endif
#ifdef USE_LASTLOG
- if (li->type == LTYPE_LOGIN)
+ if (li->type == LTYPE_LOGIN) {
lastlog_write_entry(li);
+ }
#endif
#ifdef USE_UTMP
utmp_write_entry(li);
#ifdef USE_WTMPX
wtmpx_write_entry(li);
#endif
-#ifdef CUSTOM_SYS_AUTH_RECORD_LOGIN
- if (li->type == LTYPE_LOGIN &&
- !sys_auth_record_login(li->username,li->hostname,li->line,
- &loginmsg))
- logit("Writing login record failed for %s", li->username);
-#endif
-#ifdef SSH_AUDIT_EVENTS
- if (li->type == LTYPE_LOGIN)
- audit_session_open(li->line);
- else if (li->type == LTYPE_LOGOUT)
- audit_session_close(li->line);
-#endif
- return (0);
+ return 0;
}
#ifdef LOGIN_NEEDS_UTMPX
int
login_utmp_only(struct logininfo *li)
{
- li->type = LTYPE_LOGIN;
+ li->type = LTYPE_LOGIN;
login_set_current_time(li);
# ifdef USE_UTMP
utmp_write_entry(li);
# ifdef USE_WTMPX
wtmpx_write_entry(li);
# endif
- return (0);
+ return 0;
}
#endif
return(lastlog_get_entry(li));
#else /* !USE_LASTLOG */
-#if defined(DISABLE_LASTLOG)
+#ifdef DISABLE_LASTLOG
/* On some systems we shouldn't even try to obtain last login
* time, e.g. AIX */
- return (0);
-# elif defined(USE_WTMP) && \
- (defined(HAVE_TIME_IN_UTMP) || defined(HAVE_TV_IN_UTMP))
+ return 0;
+# 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 */
return (wtmp_get_entry(li));
-# elif defined(USE_WTMPX) && \
- (defined(HAVE_TIME_IN_UTMPX) || defined(HAVE_TV_IN_UTMPX))
+# 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 */
return (wtmpx_get_entry(li));
-# else
+# else
/* Give up: No means of retrieving last login time */
- return (0);
+ 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 */
}
*/
-/*
- * line_fullname(): add the leading '/dev/' if it doesn't exist make
- * sure dst has enough space, if not just copy src (ugh)
- */
+/* line_fullname(): add the leading '/dev/' if it doesn't exist make
+ * sure dst has enough space, if not just copy src (ugh) */
char *
-line_fullname(char *dst, const char *src, u_int dstsize)
+line_fullname(char *dst, const char *src, int dstsize)
{
memset(dst, '\0', 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);
- else {
+ } else {
strlcpy(dst, "/dev/", dstsize);
strlcat(dst, src, dstsize);
}
- return (dst);
+ return dst;
}
/* line_stripname(): strip the leading '/dev' if it exists, return dst */
strlcpy(dst, src + 5, dstsize);
else
strlcpy(dst, src, dstsize);
- return (dst);
+ return dst;
}
-/*
- * line_abbrevname(): Return the abbreviated (usually four-character)
+/* line_abbrevname(): Return the abbreviated (usually four-character)
* form of the line (Just use the last <dstsize> characters of the
* full name.)
*
* NOTE: use strncpy because we do NOT necessarily want zero
- * termination
- */
+ * termination */
char *
line_abbrevname(char *dst, const char *src, int dstsize)
{
if (strncmp(src, "/dev/", 5) == 0)
src += 5;
-#ifdef WITH_ABBREV_NO_TTY
- if (strncmp(src, "tty", 3) == 0)
- src += 3;
-#endif
-
len = strlen(src);
if (len > 0) {
strncpy(dst, src, (size_t)dstsize);
}
- return (dst);
+ return dst;
}
/**
void
set_utmp_time(struct logininfo *li, struct utmp *ut)
{
-# if defined(HAVE_TV_IN_UTMP)
+# ifdef HAVE_TV_IN_UTMP
ut->ut_tv.tv_sec = li->tv_sec;
ut->ut_tv.tv_usec = li->tv_usec;
-# elif defined(HAVE_TIME_IN_UTMP)
+# else
+# ifdef HAVE_TIME_IN_UTMP
ut->ut_time = li->tv_sec;
+# endif
# endif
}
construct_utmp(struct logininfo *li,
struct utmp *ut)
{
-# ifdef HAVE_ADDR_V6_IN_UTMP
- struct sockaddr_in6 *sa6;
-# endif
-
memset(ut, '\0', sizeof(*ut));
/* First fill out fields used for both logins and logouts */
switch (li->type) {
case LTYPE_LOGIN:
ut->ut_type = USER_PROCESS;
-#ifdef _UNICOS
+#ifdef _CRAY
cray_set_tmpdir(ut);
#endif
break;
case LTYPE_LOGOUT:
ut->ut_type = DEAD_PROCESS;
-#ifdef _UNICOS
+#ifdef _CRAY
cray_retain_utmp(ut, li->pid);
#endif
break;
/* If we're logging out, leave all other fields blank */
if (li->type == LTYPE_LOGOUT)
- return;
+ return;
/*
* These fields are only used when logging in, and are blank
*/
/* Use strncpy because we don't necessarily want null termination */
- strncpy(ut->ut_name, li->username,
- MIN_SIZEOF(ut->ut_name, li->username));
+ strncpy(ut->ut_name, li->username, MIN_SIZEOF(ut->ut_name, li->username));
# ifdef HAVE_HOST_IN_UTMP
- strncpy(ut->ut_host, li->hostname,
- MIN_SIZEOF(ut->ut_host, li->hostname));
+ strncpy(ut->ut_host, li->hostname, MIN_SIZEOF(ut->ut_host, li->hostname));
# endif
# ifdef HAVE_ADDR_IN_UTMP
/* this is just a 32-bit IP address */
if (li->hostaddr.sa.sa_family == AF_INET)
ut->ut_addr = li->hostaddr.sa_in.sin_addr.s_addr;
# endif
-# ifdef HAVE_ADDR_V6_IN_UTMP
- /* this is just a 128-bit IPv6 address */
- if (li->hostaddr.sa.sa_family == AF_INET6) {
- sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa);
- memcpy(ut->ut_addr_v6, sa6->sin6_addr.s6_addr, 16);
- if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) {
- ut->ut_addr_v6[0] = ut->ut_addr_v6[3];
- ut->ut_addr_v6[1] = 0;
- ut->ut_addr_v6[2] = 0;
- ut->ut_addr_v6[3] = 0;
- }
- }
-# endif
}
#endif /* USE_UTMP || USE_WTMP || USE_LOGIN */
void
set_utmpx_time(struct logininfo *li, struct utmpx *utx)
{
-# if defined(HAVE_TV_IN_UTMPX)
+# ifdef HAVE_TV_IN_UTMPX
utx->ut_tv.tv_sec = li->tv_sec;
utx->ut_tv.tv_usec = li->tv_usec;
-# elif defined(HAVE_TIME_IN_UTMPX)
+# else /* HAVE_TV_IN_UTMPX */
+# ifdef HAVE_TIME_IN_UTMPX
utx->ut_time = li->tv_sec;
-# endif
+# endif /* HAVE_TIME_IN_UTMPX */
+# endif /* HAVE_TV_IN_UTMPX */
}
void
construct_utmpx(struct logininfo *li, struct utmpx *utx)
{
-# ifdef HAVE_ADDR_V6_IN_UTMP
- struct sockaddr_in6 *sa6;
-# endif
memset(utx, '\0', sizeof(*utx));
-
# ifdef HAVE_ID_IN_UTMPX
line_abbrevname(utx->ut_id, li->line, sizeof(utx->ut_id));
# endif
set_utmpx_time(li, utx);
utx->ut_pid = li->pid;
- /* strncpy(): Don't necessarily want null termination */
- strncpy(utx->ut_name, li->username,
- MIN_SIZEOF(utx->ut_name, li->username));
-
if (li->type == LTYPE_LOGOUT)
return;
* for logouts.
*/
+ /* strncpy(): Don't necessarily want null termination */
+ strncpy(utx->ut_name, li->username, MIN_SIZEOF(utx->ut_name, li->username));
# ifdef HAVE_HOST_IN_UTMPX
- strncpy(utx->ut_host, li->hostname,
- MIN_SIZEOF(utx->ut_host, li->hostname));
+ strncpy(utx->ut_host, li->hostname, MIN_SIZEOF(utx->ut_host, li->hostname));
# endif
# ifdef HAVE_ADDR_IN_UTMPX
/* this is just a 32-bit IP address */
if (li->hostaddr.sa.sa_family == AF_INET)
utx->ut_addr = li->hostaddr.sa_in.sin_addr.s_addr;
# endif
-# ifdef HAVE_ADDR_V6_IN_UTMP
- /* this is just a 128-bit IPv6 address */
- if (li->hostaddr.sa.sa_family == AF_INET6) {
- sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa);
- memcpy(ut->ut_addr_v6, sa6->sin6_addr.s6_addr, 16);
- if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) {
- ut->ut_addr_v6[0] = ut->ut_addr_v6[3];
- ut->ut_addr_v6[1] = 0;
- ut->ut_addr_v6[2] = 0;
- ut->ut_addr_v6[3] = 0;
- }
- }
-# endif
# ifdef HAVE_SYSLEN_IN_UTMPX
/* ut_syslen is the length of the utx_host string */
utx->ut_syslen = MIN(strlen(li->hostname), sizeof(utx->ut_host));
{
setutent();
pututline(ut);
+
# ifdef HAVE_ENDUTENT
endutent();
# endif
- return (1);
+ return 1;
}
# else /* UTMP_USE_LIBRARY */
-/*
- * Write a utmp entry direct to the file
- * This is a slightly modification of code in OpenBSD's login.c
- */
+/* write a utmp entry direct to the file */
+/* This is a slightly modification of code in OpenBSD's login.c */
static int
utmp_write_direct(struct logininfo *li, struct utmp *ut)
{
/* FIXME: (ATL) ttyslot() needs local implementation */
#if defined(HAVE_GETTTYENT)
- struct ttyent *ty;
+ register struct ttyent *ty;
tty=0;
+
setttyent();
- while (NULL != (ty = getttyent())) {
+ while ((struct ttyent *)0 != (ty = getttyent())) {
tty++;
if (!strncmp(ty->ty_name, ut->ut_line, sizeof(ut->ut_line)))
break;
}
endttyent();
- if (NULL == ty) {
- logit("%s: tty not found", __func__);
- return (0);
+ if((struct ttyent *)0 == ty) {
+ log("utmp_write_entry: tty not found");
+ return(1);
}
#else /* FIXME */
#endif /* HAVE_GETTTYENT */
if (tty > 0 && (fd = open(UTMP_FILE, O_RDWR|O_CREAT, 0644)) >= 0) {
- off_t pos, ret;
-
- pos = (off_t)tty * sizeof(struct utmp);
- if ((ret = lseek(fd, pos, SEEK_SET)) == -1) {
- logit("%s: lseek: %s", __func__, strerror(errno));
- return (0);
- }
- if (ret != pos) {
- logit("%s: Couldn't seek to tty %d slot in %s",
- __func__, tty, UTMP_FILE);
- return (0);
- }
+ (void)lseek(fd, (off_t)(tty * sizeof(struct utmp)), SEEK_SET);
/*
* Prevent luser from zero'ing out ut_host.
* If the new ut_line is empty but the old one is not
* and ut_line and ut_name match, preserve the old ut_line.
*/
if (atomicio(read, fd, &old_ut, sizeof(old_ut)) == sizeof(old_ut) &&
- (ut->ut_host[0] == '\0') && (old_ut.ut_host[0] != '\0') &&
- (strncmp(old_ut.ut_line, ut->ut_line, sizeof(ut->ut_line)) == 0) &&
- (strncmp(old_ut.ut_name, ut->ut_name, sizeof(ut->ut_name)) == 0))
- memcpy(ut->ut_host, old_ut.ut_host, sizeof(ut->ut_host));
-
- if ((ret = lseek(fd, pos, SEEK_SET)) == -1) {
- logit("%s: lseek: %s", __func__, strerror(errno));
- return (0);
- }
- if (ret != pos) {
- logit("%s: Couldn't seek to tty %d slot in %s",
- __func__, tty, UTMP_FILE);
- return (0);
+ (ut->ut_host[0] == '\0') && (old_ut.ut_host[0] != '\0') &&
+ (strncmp(old_ut.ut_line, ut->ut_line, sizeof(ut->ut_line)) == 0) &&
+ (strncmp(old_ut.ut_name, ut->ut_name, sizeof(ut->ut_name)) == 0)) {
+ (void)memcpy(ut->ut_host, old_ut.ut_host, sizeof(ut->ut_host));
}
- if (atomicio(vwrite, fd, ut, sizeof(*ut)) != sizeof(*ut)) {
- logit("%s: error writing %s: %s", __func__,
+
+ (void)lseek(fd, (off_t)(tty * sizeof(struct utmp)), SEEK_SET);
+ if (atomicio(write, fd, ut, sizeof(*ut)) != sizeof(*ut))
+ log("utmp_write_direct: error writing %s: %s",
UTMP_FILE, strerror(errno));
- }
- close(fd);
- return (1);
+ (void)close(fd);
+ return 1;
} else {
- return (0);
+ return 0;
}
}
# endif /* UTMP_USE_LIBRARY */
construct_utmp(li, &ut);
# ifdef UTMP_USE_LIBRARY
if (!utmp_write_library(li, &ut)) {
- logit("%s: utmp_write_library() failed", __func__);
- return (0);
+ log("utmp_perform_login: utmp_write_library() failed");
+ return 0;
}
# else
if (!utmp_write_direct(li, &ut)) {
- logit("%s: utmp_write_direct() failed", __func__);
- return (0);
+ log("utmp_perform_login: utmp_write_direct() failed");
+ return 0;
}
# endif
- return (1);
+ return 1;
}
construct_utmp(li, &ut);
# ifdef UTMP_USE_LIBRARY
if (!utmp_write_library(li, &ut)) {
- logit("%s: utmp_write_library() failed", __func__);
- return (0);
+ log("utmp_perform_logout: utmp_write_library() failed");
+ return 0;
}
# else
if (!utmp_write_direct(li, &ut)) {
- logit("%s: utmp_write_direct() failed", __func__);
- return (0);
+ log("utmp_perform_logout: utmp_write_direct() failed");
+ return 0;
}
# endif
- return (1);
+ return 1;
}
{
switch(li->type) {
case LTYPE_LOGIN:
- return (utmp_perform_login(li));
+ return utmp_perform_login(li);
case LTYPE_LOGOUT:
- return (utmp_perform_logout(li));
+ return utmp_perform_logout(li);
default:
- logit("%s: invalid type field", __func__);
- return (0);
+ log("utmp_write_entry: invalid type field");
+ return 0;
}
}
#endif /* USE_UTMP */
# ifdef HAVE_ENDUTXENT
endutxent();
# endif
- return (1);
+ return 1;
}
# else /* UTMPX_USE_LIBRARY */
static int
utmpx_write_direct(struct logininfo *li, struct utmpx *utx)
{
- logit("%s: not implemented!", __func__);
- return (0);
+ log("utmpx_write_direct: not implemented!");
+ return 0;
}
# endif /* UTMPX_USE_LIBRARY */
construct_utmpx(li, &utx);
# ifdef UTMPX_USE_LIBRARY
if (!utmpx_write_library(li, &utx)) {
- logit("%s: utmp_write_library() failed", __func__);
- return (0);
+ log("utmpx_perform_login: utmp_write_library() failed");
+ return 0;
}
# else
if (!utmpx_write_direct(li, &ut)) {
- logit("%s: utmp_write_direct() failed", __func__);
- return (0);
+ log("utmpx_perform_login: utmp_write_direct() failed");
+ return 0;
}
# endif
- return (1);
+ return 1;
}
{
struct utmpx utx;
- construct_utmpx(li, &utx);
+ memset(&utx, '\0', sizeof(utx));
+ set_utmpx_time(li, &utx);
+ line_stripname(utx.ut_line, li->line, sizeof(utx.ut_line));
# ifdef HAVE_ID_IN_UTMPX
line_abbrevname(utx.ut_id, li->line, sizeof(utx.ut_id));
# endif
# else
utmpx_write_direct(li, &utx);
# endif
- return (1);
+ return 1;
}
int
{
switch(li->type) {
case LTYPE_LOGIN:
- return (utmpx_perform_login(li));
+ return utmpx_perform_login(li);
case LTYPE_LOGOUT:
- return (utmpx_perform_logout(li));
+ return utmpx_perform_logout(li);
default:
- logit("%s: invalid type field", __func__);
- return (0);
+ log("utmpx_write_entry: invalid type field");
+ return 0;
}
}
#endif /* USE_UTMPX */
#ifdef USE_WTMP
-/*
- * Write a wtmp entry direct to the end of the file
- * This is a slight modification of code in OpenBSD's logwtmp.c
- */
+/* write a wtmp entry direct to the end of the file */
+/* This is a slight modification of code in OpenBSD's logwtmp.c */
static int
wtmp_write(struct logininfo *li, struct utmp *ut)
{
int fd, ret = 1;
if ((fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
- logit("%s: problem writing %s: %s", __func__,
+ log("wtmp_write: problem writing %s: %s",
WTMP_FILE, strerror(errno));
- return (0);
+ return 0;
}
if (fstat(fd, &buf) == 0)
- if (atomicio(vwrite, fd, ut, sizeof(*ut)) != sizeof(*ut)) {
+ if (atomicio(write, fd, ut, sizeof(*ut)) != sizeof(*ut)) {
ftruncate(fd, buf.st_size);
- logit("%s: problem writing %s: %s", __func__,
+ log("wtmp_write: problem writing %s: %s",
WTMP_FILE, strerror(errno));
ret = 0;
}
- close(fd);
- return (ret);
+ (void)close(fd);
+ return ret;
}
static int
struct utmp ut;
construct_utmp(li, &ut);
- return (wtmp_write(li, &ut));
+ return wtmp_write(li, &ut);
}
struct utmp ut;
construct_utmp(li, &ut);
- return (wtmp_write(li, &ut));
+ return wtmp_write(li, &ut);
}
{
switch(li->type) {
case LTYPE_LOGIN:
- return (wtmp_perform_login(li));
+ return wtmp_perform_login(li);
case LTYPE_LOGOUT:
- return (wtmp_perform_logout(li));
+ return wtmp_perform_logout(li);
default:
- logit("%s: invalid type field", __func__);
- return (0);
+ log("wtmp_write_entry: invalid type field");
+ return 0;
}
}
-/*
- * Notes on fetching login data from wtmp/wtmpx
+/* Notes on fetching login data from wtmp/wtmpx
*
* Logouts are usually recorded with (amongst other things) a blank
* username on a given tty line. However, some systems (HP-UX is one)
wtmp_islogin(struct logininfo *li, struct utmp *ut)
{
if (strncmp(li->username, ut->ut_name,
- MIN_SIZEOF(li->username, ut->ut_name)) == 0) {
+ MIN_SIZEOF(li->username, ut->ut_name)) == 0) {
# ifdef HAVE_TYPE_IN_UTMP
if (ut->ut_type & USER_PROCESS)
- return (1);
+ return 1;
# else
- return (1);
+ return 1;
# endif
}
- return (0);
+ return 0;
}
int
{
struct stat st;
struct utmp ut;
- int fd, found = 0;
+ int fd, found=0;
/* Clear the time entries in our logininfo */
li->tv_sec = li->tv_usec = 0;
if ((fd = open(WTMP_FILE, O_RDONLY)) < 0) {
- logit("%s: problem opening %s: %s", __func__,
+ log("wtmp_get_entry: problem opening %s: %s",
WTMP_FILE, strerror(errno));
- return (0);
+ return 0;
}
if (fstat(fd, &st) != 0) {
- logit("%s: couldn't stat %s: %s", __func__,
+ log("wtmp_get_entry: couldn't stat %s: %s",
WTMP_FILE, strerror(errno));
close(fd);
- return (0);
+ return 0;
}
/* Seek to the start of the last struct utmp */
if (lseek(fd, -(off_t)sizeof(struct utmp), SEEK_END) == -1) {
/* Looks like we've got a fresh wtmp file */
close(fd);
- return (0);
+ return 0;
}
while (!found) {
if (atomicio(read, fd, &ut, sizeof(ut)) != sizeof(ut)) {
- logit("%s: read of %s failed: %s", __func__,
+ log("wtmp_get_entry: read of %s failed: %s",
WTMP_FILE, strerror(errno));
close (fd);
- return (0);
+ return 0;
}
if ( wtmp_islogin(li, &ut) ) {
found = 1;
- /*
- * We've already checked for a time in struct
- * utmp, in login_getlast()
- */
+ /* We've already checked for a time in struct
+ * utmp, in login_getlast(). */
# ifdef HAVE_TIME_IN_UTMP
li->tv_sec = ut.ut_time;
# else
# endif
# endif
line_fullname(li->line, ut.ut_line,
- MIN_SIZEOF(li->line, ut.ut_line));
+ MIN_SIZEOF(li->line, ut.ut_line));
# ifdef HAVE_HOST_IN_UTMP
strlcpy(li->hostname, ut.ut_host,
- MIN_SIZEOF(li->hostname, ut.ut_host));
+ MIN_SIZEOF(li->hostname, ut.ut_host));
# endif
continue;
}
/* Seek back 2 x struct utmp */
if (lseek(fd, -(off_t)(2 * sizeof(struct utmp)), SEEK_CUR) == -1) {
/* We've found the start of the file, so quit */
- close(fd);
- return (0);
+ close (fd);
+ return 0;
}
}
/* We found an entry. Tidy up and return */
close(fd);
- return (1);
+ return 1;
}
# endif /* USE_WTMP */
**/
#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
- */
+/* 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
wtmpx_write(struct logininfo *li, struct utmpx *utx)
{
-#ifndef HAVE_UPDWTMPX
struct stat buf;
int fd, ret = 1;
if ((fd = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
- logit("%s: problem opening %s: %s", __func__,
+ log("wtmpx_write: problem opening %s: %s",
WTMPX_FILE, strerror(errno));
- return (0);
+ return 0;
}
if (fstat(fd, &buf) == 0)
- if (atomicio(vwrite, fd, utx, sizeof(*utx)) != sizeof(*utx)) {
+ if (atomicio(write, fd, utx, sizeof(*utx)) != sizeof(*utx)) {
ftruncate(fd, buf.st_size);
- logit("%s: problem writing %s: %s", __func__,
+ log("wtmpx_write: problem writing %s: %s",
WTMPX_FILE, strerror(errno));
ret = 0;
}
- close(fd);
+ (void)close(fd);
- return (ret);
-#else
- updwtmpx(WTMPX_FILE, utx);
- return (1);
-#endif
+ return ret;
}
struct utmpx utx;
construct_utmpx(li, &utx);
- return (wtmpx_write(li, &utx));
+ return wtmpx_write(li, &utx);
}
struct utmpx utx;
construct_utmpx(li, &utx);
- return (wtmpx_write(li, &utx));
+ return wtmpx_write(li, &utx);
}
{
switch(li->type) {
case LTYPE_LOGIN:
- return (wtmpx_perform_login(li));
+ return wtmpx_perform_login(li);
case LTYPE_LOGOUT:
- return (wtmpx_perform_logout(li));
+ return wtmpx_perform_logout(li);
default:
- logit("%s: invalid type field", __func__);
- return (0);
+ log("wtmpx_write_entry: invalid type field");
+ return 0;
}
}
static int
wtmpx_islogin(struct logininfo *li, struct utmpx *utx)
{
- if (strncmp(li->username, utx->ut_name,
- MIN_SIZEOF(li->username, utx->ut_name)) == 0 ) {
+ if ( strncmp(li->username, utx->ut_name,
+ MIN_SIZEOF(li->username, utx->ut_name)) == 0 ) {
# ifdef HAVE_TYPE_IN_UTMPX
if (utx->ut_type == USER_PROCESS)
- return (1);
+ return 1;
# else
- return (1);
+ return 1;
# endif
}
- return (0);
+ return 0;
}
li->tv_sec = li->tv_usec = 0;
if ((fd = open(WTMPX_FILE, O_RDONLY)) < 0) {
- logit("%s: problem opening %s: %s", __func__,
+ log("wtmpx_get_entry: problem opening %s: %s",
WTMPX_FILE, strerror(errno));
- return (0);
+ return 0;
}
if (fstat(fd, &st) != 0) {
- logit("%s: couldn't stat %s: %s", __func__,
- WTMPX_FILE, strerror(errno));
+ log("wtmpx_get_entry: couldn't stat %s: %s",
+ WTMP_FILE, strerror(errno));
close(fd);
- return (0);
+ return 0;
}
/* Seek to the start of the last struct utmpx */
if (lseek(fd, -(off_t)sizeof(struct utmpx), SEEK_END) == -1 ) {
/* probably a newly rotated wtmpx file */
close(fd);
- return (0);
+ return 0;
}
while (!found) {
if (atomicio(read, fd, &utx, sizeof(utx)) != sizeof(utx)) {
- logit("%s: read of %s failed: %s", __func__,
+ log("wtmpx_get_entry: read of %s failed: %s",
WTMPX_FILE, strerror(errno));
close (fd);
- return (0);
+ return 0;
}
- /*
- * Logouts are recorded as a blank username on a particular
- * line. So, we just need to find the username in struct utmpx
- */
- if (wtmpx_islogin(li, &utx)) {
- found = 1;
-# if defined(HAVE_TV_IN_UTMPX)
+ /* Logouts are recorded as a blank username on a particular line.
+ * So, we just need to find the username in struct utmpx */
+ if ( wtmpx_islogin(li, &utx) ) {
+# ifdef HAVE_TV_IN_UTMPX
li->tv_sec = utx.ut_tv.tv_sec;
-# elif defined(HAVE_TIME_IN_UTMPX)
+# else
+# ifdef HAVE_TIME_IN_UTMPX
li->tv_sec = utx.ut_time;
+# endif
# endif
line_fullname(li->line, utx.ut_line, sizeof(li->line));
-# if defined(HAVE_HOST_IN_UTMPX)
+# ifdef HAVE_HOST_IN_UTMPX
strlcpy(li->hostname, utx.ut_host,
- MIN_SIZEOF(li->hostname, utx.ut_host));
+ MIN_SIZEOF(li->hostname, utx.ut_host));
# endif
continue;
}
if (lseek(fd, -(off_t)(2 * sizeof(struct utmpx)), SEEK_CUR) == -1) {
- close(fd);
- return (0);
+ close (fd);
+ return 0;
}
}
close(fd);
- return (1);
+ return 1;
}
#endif /* USE_WTMPX */
{
struct utmp *ut;
- ut = xmalloc(sizeof(*ut));
+ if (! (ut = (struct utmp *)malloc(sizeof(*ut)))) {
+ log("syslogin_perform_login: couldn't malloc()");
+ return 0;
+ }
construct_utmp(li, ut);
login(ut);
- free(ut);
- return (1);
+ return 1;
}
static int
syslogin_perform_logout(struct logininfo *li)
{
# ifdef HAVE_LOGOUT
- char line[UT_LINESIZE];
+ char line[8];
(void)line_stripname(line, li->line, sizeof(line));
- if (!logout(line))
- logit("%s: logout() returned an error", __func__);
+ if (!logout(line)) {
+ log("syslogin_perform_logout: logout() returned an error");
# ifdef HAVE_LOGWTMP
- else
+ } else {
logwtmp(line, "", "");
# endif
+ }
/* FIXME: (ATL - if the need arises) What to do if we have
* login, but no logout? what if logout but no logwtmp? All
* routines are in libutil so they should all be there,
* but... */
# endif
- return (1);
+ return 1;
}
int
{
switch (li->type) {
case LTYPE_LOGIN:
- return (syslogin_perform_login(li));
+ return syslogin_perform_login(li);
case LTYPE_LOGOUT:
- return (syslogin_perform_logout(li));
+ return syslogin_perform_logout(li);
default:
- logit("%s: Invalid type field", __func__);
- return (0);
+ log("syslogin_write_entry: Invalid type field");
+ return 0;
}
}
#endif /* USE_LOGIN */
/* clear the structure */
memset(last, '\0', sizeof(*last));
- 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;
struct stat st;
if (stat(LASTLOG_FILE, &st) != 0) {
- logit("%s: Couldn't stat %s: %s", __func__,
- LASTLOG_FILE, strerror(errno));
- return (0);
+ log("lastlog_perform_login: Couldn't stat %s: %s", LASTLOG_FILE,
+ strerror(errno));
+ return 0;
}
if (S_ISDIR(st.st_mode))
- return (LL_DIR);
+ return LL_DIR;
else if (S_ISREG(st.st_mode))
- return (LL_FILE);
+ return LL_FILE;
else
- return (LL_OTHER);
+ return LL_OTHER;
}
type = lastlog_filetype(LASTLOG_FILE);
switch (type) {
- case LL_FILE:
- strlcpy(lastlog_file, LASTLOG_FILE,
- sizeof(lastlog_file));
- break;
- case LL_DIR:
- snprintf(lastlog_file, sizeof(lastlog_file), "%s/%s",
- LASTLOG_FILE, li->username);
- break;
- default:
- logit("%s: %.100s is not a file or directory!", __func__,
- LASTLOG_FILE);
- return (0);
+ case LL_FILE:
+ strlcpy(lastlog_file, LASTLOG_FILE, sizeof(lastlog_file));
+ break;
+ case LL_DIR:
+ snprintf(lastlog_file, sizeof(lastlog_file), "%s/%s",
+ LASTLOG_FILE, li->username);
+ break;
+ default:
+ log("lastlog_openseek: %.100s is not a file or directory!",
+ LASTLOG_FILE);
+ return 0;
}
- *fd = open(lastlog_file, filemode, 0600);
- if (*fd < 0) {
- debug("%s: Couldn't open %s: %s", __func__,
+ *fd = open(lastlog_file, filemode);
+ if ( *fd < 0) {
+ debug("lastlog_openseek: Couldn't open %s: %s",
lastlog_file, strerror(errno));
- return (0);
+ return 0;
}
if (type == LL_FILE) {
/* find this uid's offset in the lastlog file */
offset = (off_t) ((long)li->uid * sizeof(struct lastlog));
- if (lseek(*fd, offset, SEEK_SET) != offset) {
- logit("%s: %s->lseek(): %s", __func__,
- lastlog_file, strerror(errno));
- return (0);
+ if ( lseek(*fd, offset, SEEK_SET) != offset ) {
+ log("lastlog_openseek: %s->lseek(): %s",
+ lastlog_file, strerror(errno));
+ return 0;
}
}
- return (1);
+ return 1;
}
static int
lastlog_construct(li, &last);
if (!lastlog_openseek(li, &fd, O_RDWR|O_CREAT))
- return (0);
+ return(0);
/* write the entry */
- if (atomicio(vwrite, fd, &last, sizeof(last)) != sizeof(last)) {
+ if (atomicio(write, fd, &last, sizeof(last)) != sizeof(last)) {
close(fd);
- logit("%s: Error writing to %s: %s", __func__,
+ log("lastlog_write_filemode: Error writing to %s: %s",
LASTLOG_FILE, strerror(errno));
- return (0);
+ return 0;
}
close(fd);
- return (1);
+ return 1;
}
int
{
switch(li->type) {
case LTYPE_LOGIN:
- return (lastlog_perform_login(li));
+ return lastlog_perform_login(li);
default:
- logit("%s: Invalid type field", __func__);
- return (0);
+ log("lastlog_write_entry: Invalid type field");
+ return 0;
}
}
{
line_fullname(li->line, last->ll_line, sizeof(li->line));
strlcpy(li->hostname, last->ll_host,
- MIN_SIZEOF(li->hostname, last->ll_host));
+ MIN_SIZEOF(li->hostname, last->ll_host));
li->tv_sec = last->ll_time;
}
lastlog_get_entry(struct logininfo *li)
{
struct lastlog last;
- int fd, ret;
+ int fd;
if (!lastlog_openseek(li, &fd, O_RDONLY))
- return (0);
-
- ret = atomicio(read, fd, &last, sizeof(last));
- close(fd);
+ return 0;
- switch (ret) {
- case 0:
- memset(&last, '\0', sizeof(last));
- /* FALLTHRU */
- case sizeof(last):
- lastlog_populate_entry(li, &last);
- return (1);
- case -1:
- error("%s: Error reading from %s: %s", __func__,
+ if (atomicio(read, fd, &last, sizeof(last)) != sizeof(last)) {
+ close(fd);
+ log("lastlog_get_entry: Error reading from %s: %s",
LASTLOG_FILE, strerror(errno));
- return (0);
- default:
- error("%s: Error reading from %s: Expecting %d, got %d",
- __func__, LASTLOG_FILE, (int)sizeof(last), ret);
- return (0);
+ return 0;
}
- /* NOTREACHED */
- return (0);
-}
-#endif /* USE_LASTLOG */
-
-#ifdef USE_BTMP
- /*
- * Logs failed login attempts in _PATH_BTMP if that exists.
- * The most common login failure is to give password instead of username.
- * So the _PATH_BTMP file checked for the correct permission, so that
- * only root can read it.
- */
-
-void
-record_failed_login(const char *username, const char *hostname,
- const char *ttyn)
-{
- int fd;
- struct utmp ut;
- struct sockaddr_storage from;
- socklen_t fromlen = sizeof(from);
- struct sockaddr_in *a4;
- struct sockaddr_in6 *a6;
- time_t t;
- struct stat fst;
-
- if (geteuid() != 0)
- return;
- if ((fd = open(_PATH_BTMP, O_WRONLY | O_APPEND)) < 0) {
- debug("Unable to open the btmp file %s: %s", _PATH_BTMP,
- strerror(errno));
- return;
- }
- if (fstat(fd, &fst) < 0) {
- logit("%s: fstat of %s failed: %s", __func__, _PATH_BTMP,
- strerror(errno));
- goto out;
- }
- if((fst.st_mode & (S_IRWXG | S_IRWXO)) || (fst.st_uid != 0)){
- logit("Excess permission or bad ownership on file %s",
- _PATH_BTMP);
- goto out;
- }
-
- memset(&ut, 0, sizeof(ut));
- /* strncpy because we don't necessarily want nul termination */
- strncpy(ut.ut_user, username, sizeof(ut.ut_user));
- strlcpy(ut.ut_line, "ssh:notty", sizeof(ut.ut_line));
-
- time(&t);
- ut.ut_time = t; /* ut_time is not always a time_t */
- ut.ut_type = LOGIN_PROCESS;
- ut.ut_pid = getpid();
-
- /* strncpy because we don't necessarily want nul termination */
- strncpy(ut.ut_host, hostname, sizeof(ut.ut_host));
-
- if (packet_connection_is_on_socket() &&
- getpeername(packet_get_connection_in(),
- (struct sockaddr *)&from, &fromlen) == 0) {
- ipv64_normalise_mapped(&from, &fromlen);
- if (from.ss_family == AF_INET) {
- a4 = (struct sockaddr_in *)&from;
- memcpy(&ut.ut_addr, &(a4->sin_addr),
- MIN_SIZEOF(ut.ut_addr, a4->sin_addr));
- }
-#ifdef HAVE_ADDR_V6_IN_UTMP
- if (from.ss_family == AF_INET6) {
- a6 = (struct sockaddr_in6 *)&from;
- memcpy(&ut.ut_addr_v6, &(a6->sin6_addr),
- MIN_SIZEOF(ut.ut_addr_v6, a6->sin6_addr));
- }
-#endif
- }
+ close(fd);
- if (atomicio(vwrite, fd, &ut, sizeof(ut)) != sizeof(ut))
- error("Failed to write to %s: %s", _PATH_BTMP,
- strerror(errno));
+ lastlog_populate_entry(li, &last);
-out:
- close(fd);
+ return 1;
}
-#endif /* USE_BTMP */
+#endif /* USE_LASTLOG */
andersk / gssapi-openssh.git / blobdiff