diff options
Diffstat (limited to 'login')
| -rw-r--r-- | login/getutid_r.c | 67 | ||||
| -rw-r--r-- | login/getutline_r.c | 22 | ||||
| -rw-r--r-- | login/logwtmp.c | 62 | ||||
| -rw-r--r-- | login/pututline_r.c | 17 |
4 files changed, 104 insertions, 64 deletions
diff --git a/login/getutid_r.c b/login/getutid_r.c index 02013c29b9..347bbf3a86 100644 --- a/login/getutid_r.c +++ b/login/getutid_r.c @@ -53,32 +53,55 @@ getutid_r (const struct utmp *id, struct utmp **utmp, if (lseek (utmp_data->ut_fd, utmp_data->loc_utmp, SEEK_SET) == -1) return -1; - while (1) + if (id->ut_type == RUN_LVL || id->ut_type == BOOT_TIME + || id->ut_type == OLD_TIME || id->ut_type == NEW_TIME) { - /* Read the next entry. */ - if (read (utmp_data->ut_fd, &utmp_data->ubuf, sizeof (struct utmp)) - != sizeof (struct utmp)) + /* Search for next entry with type RUN_LVL, BOOT_TIME, + OLD_TIME, or NEW_TIME. */ + + while (1) { - errno = ESRCH; - return -1; + /* Read the next entry. */ + if (read (utmp_data->ut_fd, &utmp_data->ubuf, sizeof (struct utmp)) + != sizeof (struct utmp)) + { + errno = ESRCH; + return -1; + } + + /* Update position pointer. */ + utmp_data->loc_utmp += sizeof (struct utmp); + + if (id->ut_type == utmp_data->ubuf.ut_type) + break; } + } + else + { + /* Search for the next entry with the specified ID and with type + INIT_PROCESS, LOGIN_PROCESS, USER_PROCESS, or DEAD_PROCESS. */ - /* Update position pointer. */ - utmp_data->loc_utmp += sizeof (struct utmp); - - if ((id->ut_type == RUN_LVL || id->ut_type == BOOT_TIME - || id->ut_type == OLD_TIME || id->ut_type == NEW_TIME) - && id->ut_type != utmp_data->ubuf.ut_type) - /* Stop at the next entry with type RUN_LVL, BOOT_TIME, - OLD_TIME, or NEW_TIME. */ - break; - - if ((id->ut_type == INIT_PROCESS || id->ut_type == LOGIN_PROCESS - || id->ut_type == USER_PROCESS || id->ut_type == DEAD_PROCESS) - && strncmp (id->ut_id, utmp_data->ubuf.ut_id, sizeof id->ut_id) == 0) - /* Stop at the next entry with the specified ID and with type - INIT_PROCESS, LOGIN_PROCESS, USER_PROCESS, or DEAD_PROCESS. */ - break; + while (1) + { + /* Read the next entry. */ + if (read (utmp_data->ut_fd, &utmp_data->ubuf, sizeof (struct utmp)) + != sizeof (struct utmp)) + { + errno = ESRCH; + return -1; + } + + /* Update position pointer. */ + utmp_data->loc_utmp += sizeof (struct utmp); + + if (( utmp_data->ubuf.ut_type == INIT_PROCESS + || utmp_data->ubuf.ut_type == LOGIN_PROCESS + || utmp_data->ubuf.ut_type == USER_PROCESS + || utmp_data->ubuf.ut_type == DEAD_PROCESS) + && (strncmp (utmp_data->ubuf.ut_id, id->ut_id, sizeof id->ut_id) + == 0)) + break; + } } *utmp = &utmp_data->ubuf; diff --git a/login/getutline_r.c b/login/getutline_r.c index 965d46ce8f..4d3547181f 100644 --- a/login/getutline_r.c +++ b/login/getutline_r.c @@ -55,22 +55,16 @@ getutline_r (const struct utmp *line, struct utmp **utmp, /* Update position pointer. */ utmp_data->loc_utmp += sizeof (struct utmp); + if ( #if _HAVE_UT_TYPE - 0 - if (utmp_data->ubuf.ut_type == USER_PROCESS - && strncmp (line->ut_line, utmp_data->ubuf.ut_line, - sizeof line->ut_line) == 0) - /* Stop if we found an user entry. */ - break; - - if (utmp_data->ubuf.ut_type == LOGIN_PROCESS) - /* Stop if we found a login entry. */ - break; -#else /* !_HAVE_UT_TYPE */ - if (strncmp (line->ut_line, utmp_data->ubuf.ut_line, - sizeof line->ut_line) == 0) - /* Stop if the line match. */ - break; + (utmp_data->ubuf.ut_type == USER_PROCESS + || utmp_data->ubuf.ut_type == LOGIN_PROCESS) + && #endif + ! strncmp (line->ut_line, utmp_data->ubuf.ut_line, + sizeof line->ut_line)) + /* Stop if we found a user or login entry. */ + break; } *utmp = &utmp_data->ubuf; diff --git a/login/logwtmp.c b/login/logwtmp.c index 371f34ee76..2ae6a68dca 100644 --- a/login/logwtmp.c +++ b/login/logwtmp.c @@ -17,33 +17,31 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <errno.h> #include <string.h> #include <unistd.h> #include <utmp.h> - +#include <sys/file.h> +#include <sys/stat.h> void logwtmp (const char *line, const char *name, const char *host) { - struct utmp_data data; struct utmp ut; + struct stat st; + size_t written; + int fd; - /* Tell that we want to use the UTMP file. */ - if (utmpname (_PATH_WTMP) == 0) - return; - - /* Open UTMP file. */ - setutent_r (&data); - - /* Position at end of file. */ - data.loc_utmp = lseek (data.ut_fd, 0, SEEK_END); - if (data.loc_utmp == -1) - return; + /* Open WTMP file. */ + fd = __open (_PATH_WTMP, O_WRONLY | O_APPEND); + if (fd < 0) + return; /* Set information in new entry. */ - bzero (&ut, sizeof (ut)); + memset (&ut, 0, sizeof (ut)); + ut.ut_pid = getpid (); #if _HAVE_UT_TYPE - 0 - ut.ut_type = USER_PROCESS; + ut.ut_type = name[0] ? USER_PROCESS : DEAD_PROCESS; #endif strncpy (ut.ut_line, line, sizeof ut.ut_line); strncpy (ut.ut_name, name, sizeof ut.ut_name); @@ -52,14 +50,36 @@ logwtmp (const char *line, const char *name, const char *host) #endif #if _HAVE_UT_TV - 0 - gettimeofday (&ut.ut_tv, NULL); + __gettimeofday (&ut.ut_tv, NULL); #else - time (&ut.ut_time); + __time (&ut.ut_time); #endif - /* Write the entry. */ - pututline_r (&ut, &data); + /* Try to lock the file. */ + if (__flock (fd, LOCK_EX | LOCK_NB) < 0 && errno != ENOSYS) + { + /* Oh, oh. The file is already locked. Wait a bit and try again. */ + sleep (1); + + /* This time we ignore the error. */ + __flock (fd, LOCK_EX | LOCK_NB); + } + + /* Remeber original size of log file: */ + if (__fstat (fd, &st) < 0) + goto done; + + /* Write the entry. If we can't write all the bytes, reset the file + size back to the original size. That way, no partial entries + will remain. */ + written = __write (fd, &ut, sizeof (ut)); + if (written > 0 && written != sizeof (ut)) + ftruncate (fd, st.st_size); + +done: + /* And unlock the file. */ + __flock (fd, LOCK_UN); - /* Close UTMP file. */ - endutent_r (&data); + /* Close WTMP file. */ + __close (fd); } diff --git a/login/pututline_r.c b/login/pututline_r.c index 4c9a91fdec..42994e899f 100644 --- a/login/pututline_r.c +++ b/login/pututline_r.c @@ -58,12 +58,15 @@ pututline_r (const struct utmp *id, struct utmp_data *utmp_data) return -1; } -#if _HAVE_UT_TYPE - 0 - /* Seek position to write. */ - if (utmp_data->loc_utmp >= sizeof (struct utmp) - && utmp_data->ubuf.ut_type != id->ut_type) +#if _HAVE_UT_ID - 0 + /* Check whether we need to reposition. Repositioning is necessary + either if the data in UTMP_DATA is not valid or if the ids don't + match: */ + if (utmp_data->loc_utmp < (off_t) sizeof (struct utmp) + || strncmp(utmp_data->ubuf.ut_id, id->ut_id, sizeof (id->ut_id)) != 0) { - /* We must not overwrite the data in UTMP_DATA. */ + /* We must not overwrite the data in UTMP_DATA since ID may be + aliasing it. */ struct utmp_data *data_tmp = alloca (sizeof (*data_tmp)); struct utmp *dummy; @@ -77,7 +80,7 @@ pututline_r (const struct utmp *id, struct utmp_data *utmp_data) pointer now is at the end of the file. */ return -1; - /* Set position pointer to position after adding of the record. */ + /* Set position pointer to position behind the record. */ utmp_data->loc_utmp += sizeof (struct utmp); } } @@ -98,7 +101,7 @@ pututline_r (const struct utmp *id, struct utmp_data *utmp_data) if (result >= 0) /* Position file correctly. */ - if (utmp_data->loc_utmp < sizeof (struct utmp)) + if (utmp_data->loc_utmp < (off_t) sizeof (struct utmp)) /* Not located at any valid entry. Add at the end. */ { result = lseek (utmp_data->ut_fd, 0L, SEEK_END); |