diff options
Diffstat (limited to 'login')
| -rw-r--r-- | login/getutent_r.c | 135 | ||||
| -rw-r--r-- | login/getutid_r.c | 10 | ||||
| -rw-r--r-- | login/getutline.c | 6 | ||||
| -rw-r--r-- | login/getutline_r.c | 10 | ||||
| -rw-r--r-- | login/logout.c | 2 | ||||
| -rw-r--r-- | login/programs/database.c | 60 | ||||
| -rw-r--r-- | login/programs/utmpdump.c | 12 | ||||
| -rw-r--r-- | login/programs/xtmp.c | 30 | ||||
| -rw-r--r-- | login/programs/xtmp.h | 2 | ||||
| -rw-r--r-- | login/utmp_daemon.c | 143 | ||||
| -rw-r--r-- | login/utmp_file.c | 179 | ||||
| -rw-r--r-- | login/utmpname.c | 2 |
12 files changed, 312 insertions, 279 deletions
diff --git a/login/getutent_r.c b/login/getutent_r.c index 98c5469463..96c458f3a3 100644 --- a/login/getutent_r.c +++ b/login/getutent_r.c @@ -18,20 +18,20 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <assert.h> #include <bits/libc-lock.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> #include <utmp.h> #include "utmp-private.h" -/* The various backends we have. */ +/* Functions defined here. */ +static int setutent_unknown (void); static int getutent_r_unknown (struct utmp *buffer, struct utmp **result); +static int getutid_r_unknown (const struct utmp *line, struct utmp *buffer, + struct utmp **result); +static int getutline_r_unknown (const struct utmp *id, struct utmp *buffer, + struct utmp **result); static struct utmp *pututline_unknown (const struct utmp *data); -static int setutent_unknown (void); static void endutent_unknown (void); /* Initial Jump table. */ @@ -39,8 +39,8 @@ struct utfuncs __libc_utmp_unknown_functions = { setutent_unknown, getutent_r_unknown, - NULL, - NULL, + getutid_r_unknown, + getutline_r_unknown, pututline_unknown, endutent_unknown, NULL @@ -53,58 +53,99 @@ struct utfuncs *__libc_utmp_jump_table = &__libc_utmp_unknown_functions; __libc_lock_define_initialized (, __libc_utmp_lock) -void -__setutent (void) +static int +setutent_unknown (void) { - __libc_lock_lock (__libc_utmp_lock); + int result; - (*__libc_utmp_jump_table->setutent) (); + /* See whether utmpd is running. */ + result = (*__libc_utmp_daemon_functions.setutent) (); + if (result) + __libc_utmp_jump_table = &__libc_utmp_daemon_functions; + else + { + result = (*__libc_utmp_file_functions.setutent) (); + if (result) + __libc_utmp_jump_table = &__libc_utmp_file_functions; + } - __libc_lock_unlock (__libc_utmp_lock); + return result; } -weak_alias (__setutent, setutent) -weak_alias (__setutent, setutxent) -void -__endutent (void) +static int +getutent_r_unknown (struct utmp *buffer, struct utmp **result) { - __libc_lock_lock (__libc_utmp_lock); + /* The backend was not yet initialized. */ + if (setutent_unknown ()) + return (*__libc_utmp_jump_table->getutent_r) (buffer, result); - (*__libc_utmp_jump_table->endutent) (); + /* Not available. */ + *result = NULL; + return -1; +} - __libc_lock_unlock (__libc_utmp_lock); + +static int +getutid_r_unknown (const struct utmp *id, struct utmp *buffer, + struct utmp **result) +{ + /* The backend was not yet initialized. */ + if (setutent_unknown ()) + return (*__libc_utmp_jump_table->getutid_r) (id, buffer, result); + + /* Not available. */ + *result = NULL; + return -1; } -weak_alias (__endutent, endutent) -weak_alias (__endutent, endutxent) static int -setutent_unknown (void) +getutline_r_unknown (const struct utmp *line, struct utmp *buffer, + struct utmp **result) { - int result; + /* The backend was not yet initialized. */ + if (setutent_unknown ()) + return (*__libc_utmp_jump_table->getutline_r) (line, buffer, result); - /* See whether utmpd is running. */ - result = (*__libc_utmp_daemon_functions.setutent) (); - if (result) - __libc_utmp_jump_table = &__libc_utmp_daemon_functions; - else - { - result = (*__libc_utmp_file_functions.setutent) (); - __libc_utmp_jump_table = &__libc_utmp_file_functions; - } + /* Not available. */ + *result = NULL; + return -1; +} - return result; + +static struct utmp * +pututline_unknown (const struct utmp *data) +{ + /* The backend was not yet initialized. */ + if (setutent_unknown ()) + return (*__libc_utmp_jump_table->pututline) (data); + + /* Not available. */ + return NULL; } static void endutent_unknown (void) { - /* Huh, how do we came here? Nothing to do. */ + /* Nothing to do. */ } +void +__setutent (void) +{ + __libc_lock_lock (__libc_utmp_lock); + + (*__libc_utmp_jump_table->setutent) (); + + __libc_lock_unlock (__libc_utmp_lock); +} +weak_alias (__setutent, setutent) +weak_alias (__setutent, setutxent) + + int __getutent_r (struct utmp *buffer, struct utmp **result) { @@ -121,16 +162,6 @@ __getutent_r (struct utmp *buffer, struct utmp **result) weak_alias (__getutent_r, getutent_r) -static int -getutent_r_unknown (struct utmp *buffer, struct utmp **result) -{ - /* It is not yet initialized. */ - __setutent (); - - return (*__libc_utmp_jump_table->getutent_r) (buffer, result); -} - - struct utmp * __pututline (const struct utmp *data) { @@ -148,11 +179,15 @@ weak_alias (__pututline, pututline) weak_alias (__pututline, pututxline) -static struct utmp * -pututline_unknown (const struct utmp *data) +void +__endutent (void) { - /* It is not yet initialized. */ - __setutent (); + __libc_lock_lock (__libc_utmp_lock); - return (*__libc_utmp_jump_table->pututline) (data); + (*__libc_utmp_jump_table->endutent) (); + __libc_utmp_jump_table = &__libc_utmp_unknown_functions; + + __libc_lock_unlock (__libc_utmp_lock); } +weak_alias (__endutent, endutent) +weak_alias (__endutent, endutxent) diff --git a/login/getutid_r.c b/login/getutid_r.c index 90b75b8c01..3d5d63de29 100644 --- a/login/getutid_r.c +++ b/login/getutid_r.c @@ -20,8 +20,6 @@ #include <errno.h> #include <bits/libc-lock.h> -#include <string.h> -#include <unistd.h> #include <utmp.h> #include "utmp-private.h" @@ -38,7 +36,7 @@ int __getutid_r (const struct utmp *id, struct utmp *buffer, struct utmp **result) { #if (_HAVE_UT_ID - 0) && (_HAVE_UT_TYPE - 0) - int retval = -1; + int retval; /* Test whether ID has any of the legal types. */ if (id->ut_type != RUN_LVL && id->ut_type != BOOT_TIME @@ -54,11 +52,7 @@ __getutid_r (const struct utmp *id, struct utmp *buffer, struct utmp **result) __libc_lock_lock (__libc_utmp_lock); - /* Not yet initialized. */ - if ((*__libc_utmp_jump_table->setutent) ()) - retval = (*__libc_utmp_jump_table->getutid_r) (id, buffer, result); - else - *result = NULL; + retval = (*__libc_utmp_jump_table->getutid_r) (id, buffer, result); __libc_lock_unlock (__libc_utmp_lock); diff --git a/login/getutline.c b/login/getutline.c index 16a02f6e89..1e1ecb1ce3 100644 --- a/login/getutline.c +++ b/login/getutline.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -25,7 +25,7 @@ static struct utmp buffer; struct utmp * -getutline (const struct utmp *line) +__getutline (const struct utmp *line) { struct utmp *result; @@ -34,3 +34,5 @@ getutline (const struct utmp *line) return result; } +weak_alias (__getutline, getutline) +weak_alias (__getutline, getutxline) diff --git a/login/getutline_r.c b/login/getutline_r.c index a1bdc0bc4e..57335941c1 100644 --- a/login/getutline_r.c +++ b/login/getutline_r.c @@ -20,8 +20,6 @@ #include <errno.h> #include <bits/libc-lock.h> -#include <string.h> -#include <unistd.h> #include <utmp.h> #include "utmp-private.h" @@ -38,15 +36,11 @@ int __getutline_r (const struct utmp *line, struct utmp *buffer, struct utmp **result) { - int retval = -1; + int retval; __libc_lock_lock (__libc_utmp_lock); - /* Not yet initialized. */ - if ((*__libc_utmp_jump_table->setutent) ()) - retval = (*__libc_utmp_jump_table->getutline_r) (line, buffer, result); - else - *result = NULL; + retval = (*__libc_utmp_jump_table->getutline_r) (line, buffer, result); __libc_lock_unlock (__libc_utmp_lock); diff --git a/login/logout.c b/login/logout.c index 8a406c01ca..9a87fe4e3f 100644 --- a/login/logout.c +++ b/login/logout.c @@ -30,7 +30,7 @@ logout (const char *line) int result = 0; /* Tell that we want to use the UTMP file. */ - if (utmpname (_PATH_UTMP) == 0) + if (utmpname (_PATH_UTMP) == -1) return 0; /* Open UTMP file. */ diff --git a/login/programs/database.c b/login/programs/database.c index 00d573f336..7044cd8d87 100644 --- a/login/programs/database.c +++ b/login/programs/database.c @@ -88,7 +88,7 @@ open_database (const char *file, const char *old_file) error (0, errno, "%s", old_file); goto return_error; } - + database->old_file = strdup (old_file); if (database->old_file == NULL) { @@ -100,12 +100,12 @@ open_database (const char *file, const char *old_file) /* Initialize database. */ if (initialize_database (database) < 0) goto return_error; - + return database; return_error: close_database (database); - + return NULL; } @@ -121,16 +121,16 @@ synchronize_database (utmp_database *database) { time_t curtime; time_t mtime; - + curtime = time (NULL); - + if (get_mtime (database->old_fd, &mtime) < 0) { error (0, errno, _("%s: cannot get modification time"), database->old_file); return -1; } - + if (mtime >= database->mtime) { int position = 0; @@ -141,7 +141,7 @@ synchronize_database (utmp_database *database) { if (read_old_entry (database, position, &old_entry) < 0) break; - + if (read_entry (database, position, &entry) < 0 || !compare_entry (&old_entry, &entry)) { @@ -157,7 +157,7 @@ synchronize_database (utmp_database *database) database->mtime = curtime; } - + } return 0; @@ -175,7 +175,7 @@ close_database (utmp_database *database) if (database->old_fd >= 0) close (database->old_fd); - + /* Free allocated memory. */ if (database->file) free (database->file); @@ -200,7 +200,7 @@ read_entry (utmp_database *database, int position, struct utmp *entry) nbytes = read (database->fd, entry, sizeof (struct utmp)); if (nbytes != sizeof (struct utmp)) return -1; - + return 0; } @@ -221,7 +221,7 @@ write_entry (utmp_database *database, int position, fl.l_type = F_WRLCK; fl.l_whence = SEEK_SET; fcntl (database->fd, F_SETLKW, &fl); - + offset = position * sizeof (struct utmp); if (lseek (database->fd, offset, SEEK_SET) < 0) goto fail; @@ -259,7 +259,7 @@ append_entry (utmp_database *database, const struct utmp *entry) fl.l_type = F_WRLCK; fl.l_whence = SEEK_SET; fcntl (database->fd, F_SETLKW, &fl); - + offset = lseek (database->fd, 0, SEEK_END); if (offset % sizeof (struct utmp) != 0) { @@ -278,7 +278,7 @@ append_entry (utmp_database *database, const struct utmp *entry) } result = offset / sizeof (struct utmp); - + fail: /* And unlock the file. */ fl.l_type = F_UNLCK; @@ -303,7 +303,7 @@ read_old_entry (utmp_database *database, int position, nbytes = read (database->old_fd, &old_entry, sizeof (struct xtmp)); if (nbytes != sizeof (struct xtmp)) return -1; - + xtmp_to_utmp (&old_entry, entry); return 0; } @@ -318,7 +318,7 @@ write_old_entry (utmp_database *database, int position, off_t offset; utmp_to_xtmp (entry, &old_entry); - + offset = position * sizeof (struct xtmp); if (lseek (database->old_fd, offset, SEEK_SET) < 0) return -1; @@ -337,7 +337,7 @@ initialize_database (utmp_database *database) { struct utmp entry; int position = 0; - + assert (database); /* Check if there is a file in the old format to read. */ @@ -395,6 +395,7 @@ initialize_database (utmp_database *database) } +#if _HAVE_UT_TYPE - 0 static int store_state_entry (utmp_database *database, int old_position, const struct utmp *old_entry) @@ -413,7 +414,7 @@ store_state_entry (utmp_database *database, int old_position, /* Read the next entry. */ if (read_entry (database, new_position, &new_entry) < 0) break; - + if (old_entry->ut_type == new_entry.ut_type) { found = 1; @@ -428,16 +429,23 @@ store_state_entry (utmp_database *database, int old_position, { const struct utmp *entry; - if (old_entry->ut_time > new_entry.ut_time) + if ( +#if _HAVE_UT_TV - 0 + old_entry->ut_tv.tv_sec > new_entry.ut_tv.tv_sec +#else + old_entry->ut_time > new_entry.ut_time +#endif + ) entry = old_entry; else entry = &new_entry; - + return replace_entry (database, old_position, new_position, entry); } return store_entry (database, old_position, old_entry); } +#endif static int @@ -468,11 +476,17 @@ store_process_entry (utmp_database *database, int old_position, { const struct utmp *entry; - if (old_entry->ut_time > new_entry.ut_time) + if ( +#if _HAVE_UT_TV - 0 + old_entry->ut_tv.tv_sec > new_entry.ut_tv.tv_sec +#else + old_entry->ut_time > new_entry.ut_time +#endif + ) entry = old_entry; else entry = &new_entry; - + return replace_entry (database, old_position, new_position, entry); } @@ -485,7 +499,7 @@ replace_entry (utmp_database *database, int old_position, int new_position, const struct utmp *entry) { struct utmp tmp; - + if (read_entry (database, old_position, &tmp) < 0 || write_entry (database, old_position, entry) < 0 || write_entry (database, new_position, &tmp) < 0) @@ -518,7 +532,7 @@ static int get_mtime (int filedes, time_t *timer) { struct stat st; - + if (fstat (filedes, &st) < 0) return -1; diff --git a/login/programs/utmpdump.c b/login/programs/utmpdump.c index e1422b5028..7be404ce24 100644 --- a/login/programs/utmpdump.c +++ b/login/programs/utmpdump.c @@ -29,9 +29,15 @@ void print_entry (struct utmp *up) { +#if _HAVE_UT_TV - 0 printf ("[%d] [%05d] [%-4.4s] [%-8.8s] [%-12.12s] [%-15.15s] [%ld]\n", up->ut_type, up->ut_pid, up->ut_id, up->ut_user, - up->ut_line, 4 + ctime (&up->ut_time), up->ut_tv.tv_usec); + up->ut_line, 4 + ctime (&up->ut_tv.tv_sec), up->ut_tv.tv_usec); +#else + printf ("[%d] [%05d] [%-4.4s] [%-8.8s] [%-12.12s] [%-15.15s]\n", + up->ut_type, up->ut_pid, up->ut_id, up->ut_user, + up->ut_line, 4 + ctime (&up->ut_time)); +#endif } int @@ -41,13 +47,13 @@ main (int argc, char *argv[]) if (argc > 1) utmpname (argv[1]); - + setutent (); while ((up = getutent ())) print_entry (up); endutent (); - + return EXIT_SUCCESS; } diff --git a/login/programs/xtmp.c b/login/programs/xtmp.c index d2d5feee3b..105145b01d 100644 --- a/login/programs/xtmp.c +++ b/login/programs/xtmp.c @@ -42,7 +42,11 @@ xtmp_to_utmp (const struct xtmp *xtmp, struct utmp *utmp) #if _HAVE_XT_ID - 0 strncpy (utmp->ut_id, xtmp->xt_id, sizeof xtmp->xt_id); #endif +#if _HAVE_UT_TV - 0 + utmp->ut_tv.tv_sec = xtmp->xt_time; +#else utmp->ut_time = xtmp->xt_time; +#endif strncpy (utmp->ut_user, xtmp->xt_user, XT_NAMESIZE); #if _HAVE_XT_HOST - 0 strncpy (utmp->ut_host, xtmp->xt_host, XT_HOSTSIZE); @@ -66,7 +70,11 @@ utmp_to_xtmp (const struct utmp *utmp, struct xtmp *xtmp) #if _HAVE_XT_ID - 0 strncpy (xtmp->xt_id, utmp->ut_id, sizeof xtmp->xt_id); #endif +#if _HAVE_UT_TV - 0 + xtmp->xt_time = utmp->ut_tv.tv_sec; +#else xtmp->xt_time = utmp->ut_time; +#endif strncpy (xtmp->xt_user, utmp->ut_user, XT_NAMESIZE); #if _HAVE_XT_HOST - 0 strncpy (xtmp->xt_host, utmp->ut_host, XT_HOSTSIZE); @@ -79,24 +87,28 @@ utmp_to_xtmp (const struct utmp *utmp, struct xtmp *xtmp) function returns 1 if the information that is in both old and new style entries is identical. Otherwise this function returns 0. */ int -compare_entry (const struct utmp *xtmp, const struct utmp *utmp) +compare_entry (const struct xtmp *xtmp, const struct utmp *utmp) { return ( #if _HAVE_XT_TYPE - 0 - xtmp->ut_type == utmp->ut_type + xtmp->xt_type == utmp->ut_type #endif #if _HAVE_XT_PID - 0 - && xtmp->ut_pid == utmp->ut_pid + && xtmp->xt_pid == utmp->ut_pid #endif - && !strncmp (xtmp->ut_line, utmp->ut_line, XT_LINESIZE - 1) + && !strncmp (xtmp->xt_line, utmp->ut_line, XT_LINESIZE - 1) #if _HAVE_XT_ID - 0 - && !strncmp (xtmp->ut_id, utmp->ut_id, sizeof utmp->ut_id) + && !strncmp (xtmp->xt_id, utmp->ut_id, sizeof utmp->ut_id) +#endif +#if _HAVE_UT_TV - 0 + && xtmp->xt_time == utmp->ut_tv.tv_sec +#else + && xtmp->xt_time == utmp->ut_time #endif - && xtmp->ut_time == utmp->ut_time - && !strncmp (xtmp->ut_user, utmp->ut_user, XT_NAMESIZE) + && !strncmp (xtmp->xt_user, utmp->ut_user, XT_NAMESIZE) #if _HAVE_XT_HOST - 0 - && !strncmp (xtmp->ut_host, utmp->ut_host, XT_HOSTSIZE - 1) + && !strncmp (xtmp->xt_host, utmp->ut_host, XT_HOSTSIZE - 1) #endif - && xtmp->ut_addr == utmp->ut_addr); + && xtmp->xt_addr == utmp->ut_addr); } diff --git a/login/programs/xtmp.h b/login/programs/xtmp.h index 8fa982ee4f..508993248a 100644 --- a/login/programs/xtmp.h +++ b/login/programs/xtmp.h @@ -50,7 +50,7 @@ struct xtmp extern void xtmp_to_utmp (const struct xtmp *xtmp, struct utmp *utmp); extern void utmp_to_xtmp (const struct utmp *utmp, struct xtmp *xtmp); -extern int compare_entry (const struct utmp *xtmp, +extern int compare_entry (const struct xtmp *xtmp, const struct utmp *utmp); #endif /* xtmp.h */ diff --git a/login/utmp_daemon.c b/login/utmp_daemon.c index 5907e06e2d..db3c90e428 100644 --- a/login/utmp_daemon.c +++ b/login/utmp_daemon.c @@ -17,8 +17,8 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <assert.h> #include <errno.h> -#include <limits.h> #include <stdlib.h> #include <string.h> #include <sys/socket.h> @@ -31,7 +31,7 @@ /* Descriptor for the socket. */ -static int daemon_sock = INT_MIN; +static int daemon_sock = -1; /* Functions defined here. */ @@ -59,12 +59,13 @@ struct utfuncs __libc_utmp_daemon_functions = static int do_setutent (int sock); static int do_getutent (int sock, struct utmp *buffer); -static int do_endutent (int sock); -static int do_getutline (int sock, const struct utmp *line, - struct utmp *buffer); static int do_getutid (int sock, const struct utmp *id, struct utmp *buffer); static int do_pututline (int sock, const struct utmp *utmp); +static int do_getutline (int sock, const struct utmp *line, + struct utmp *buffer); +static int do_pututline (int sock, const struct utmp *utmp); +static int do_endutent (int sock); static int do_updwtmp (int sock, const char *file, const struct utmp *utmp); @@ -79,7 +80,7 @@ setutent_daemon (void) if (access (_PATH_UTMPD_RW, F_OK) == -1 && access (_PATH_UTMPD_RO, F_OK) == -1) return 0; - + if (daemon_sock < 0) { daemon_sock = open_socket (_PATH_UTMPD_RW); @@ -100,33 +101,10 @@ setutent_daemon (void) } -static void -endutent_daemon (void) -{ - if (daemon_sock >= 0) - { - /* Send request to the daemon. */ - do_endutent (daemon_sock); - close (daemon_sock); - } - - daemon_sock = INT_MIN; -} - - static int getutent_r_daemon (struct utmp *buffer, struct utmp **result) { - /* Open connection if not already done. */ - if (daemon_sock == INT_MIN) - setutent_daemon (); - - if (daemon_sock < 0) - { - /* Not available. */ - *result = NULL; - return -1; - } + assert (daemon_sock >= 0); /* Send request to the daemon. */ if (do_getutent (daemon_sock, buffer) < 0) @@ -141,20 +119,16 @@ getutent_r_daemon (struct utmp *buffer, struct utmp **result) static int -getutline_r_daemon (const struct utmp *line, struct utmp *buffer, - struct utmp **result) +getutid_r_daemon (const struct utmp *id, struct utmp *buffer, + struct utmp **result) { - if (daemon_sock < 0) - { - *result = NULL; - return -1; - } + assert (daemon_sock >= 0); /* Send request to the daemon. */ - if (do_getutline (daemon_sock, line, buffer) < 0) + if (do_getutid (daemon_sock, id, buffer) < 0) { *result = NULL; - return -1;; + return -1; } *result = buffer; @@ -163,17 +137,13 @@ getutline_r_daemon (const struct utmp *line, struct utmp *buffer, static int -getutid_r_daemon (const struct utmp *id, struct utmp *buffer, - struct utmp **result) +getutline_r_daemon (const struct utmp *line, struct utmp *buffer, + struct utmp **result) { - if (daemon_sock < 0) - { - *result = NULL; - return -1; - } + assert (daemon_sock >= 0); /* Send request to the daemon. */ - if (do_getutid (daemon_sock, id, buffer) < 0) + if (do_getutline (daemon_sock, line, buffer) < 0) { *result = NULL; return -1; @@ -187,13 +157,7 @@ getutid_r_daemon (const struct utmp *id, struct utmp *buffer, static struct utmp * pututline_daemon (const struct utmp *utmp) { - /* Open connection if not already done. */ - if (daemon_sock == INT_MIN) - setutent_daemon (); - - if (daemon_sock < 0) - /* Something went wrong. */ - return NULL; + assert (daemon_sock >= 0); /* Send request to the daemon. */ if (do_pututline (daemon_sock, utmp) < 0) @@ -203,6 +167,19 @@ pututline_daemon (const struct utmp *utmp) } +static void +endutent_daemon (void) +{ + assert (daemon_sock >= 0); + + /* Send request to the daemon. */ + do_endutent (daemon_sock); + + close (daemon_sock); + daemon_sock = -1; +} + + static int updwtmp_daemon (const char *file, const struct utmp *utmp) { @@ -233,11 +210,11 @@ do_setutent (int sock) size_t size; size = sizeof (setutent_request) + strlen (__libc_utmp_file_name) + 1; - + request = malloc (size); if (request == NULL) return -1; - + request->header.version = UTMPD_VERSION; request->header.size = size; request->header.type = UTMPD_REQ_SETUTENT; @@ -286,24 +263,27 @@ do_getutent (int sock, struct utmp *buffer) } static int -do_endutent (int sock) +do_getutid (int sock, const struct utmp *id, struct utmp *buffer) { - endutent_request request; - endutent_reply reply; + getutid_request request; + getutid_reply reply; request.header.version = UTMPD_VERSION; - request.header.size = sizeof (endutent_request); - request.header.type = UTMPD_REQ_ENDUTENT; + request.header.size = sizeof (getutid_request); + request.header.type = UTMPD_REQ_GETUTID; + memcpy (&request.id, id, sizeof (struct utmp)); reply.header.version = UTMPD_VERSION; - reply.header.size = sizeof (endutent_reply); - reply.header.type = UTMPD_REQ_ENDUTENT; + reply.header.size = sizeof (getutid_reply); + reply.header.type = UTMPD_REQ_GETUTID; if (send_request (sock, &request.header, &reply.header) < 0) return -1; if (reply.result < 0) __set_errno (reply.errnum); + else + memcpy (buffer, &reply.entry, sizeof (struct utmp)); return reply.result; } @@ -335,45 +315,42 @@ do_getutline (int sock, const struct utmp *line, struct utmp *buffer) } static int -do_getutid (int sock, const struct utmp *id, struct utmp *buffer) +do_pututline (int sock, const struct utmp *utmp) { - getutid_request request; - getutid_reply reply; + pututline_request request; + pututline_reply reply; request.header.version = UTMPD_VERSION; - request.header.size = sizeof (getutid_request); - request.header.type = UTMPD_REQ_GETUTID; - memcpy (&request.id, id, sizeof (struct utmp)); + request.header.size = sizeof (pututline_request); + request.header.type = UTMPD_REQ_PUTUTLINE; + memcpy (&request.utmp, utmp, sizeof (struct utmp)); reply.header.version = UTMPD_VERSION; - reply.header.size = sizeof (getutid_reply); - reply.header.type = UTMPD_REQ_GETUTID; + reply.header.size = sizeof (pututline_reply); + reply.header.type = UTMPD_REQ_PUTUTLINE; if (send_request (sock, &request.header, &reply.header) < 0) return -1; if (reply.result < 0) __set_errno (reply.errnum); - else - memcpy (buffer, &reply.entry, sizeof (struct utmp)); return reply.result; } static int -do_pututline (int sock, const struct utmp *utmp) +do_endutent (int sock) { - pututline_request request; - pututline_reply reply; + endutent_request request; + endutent_reply reply; request.header.version = UTMPD_VERSION; - request.header.size = sizeof (pututline_request); - request.header.type = UTMPD_REQ_PUTUTLINE; - memcpy (&request.utmp, utmp, sizeof (struct utmp)); + request.header.size = sizeof (endutent_request); + request.header.type = UTMPD_REQ_ENDUTENT; reply.header.version = UTMPD_VERSION; - reply.header.size = sizeof (pututline_reply); - reply.header.type = UTMPD_REQ_PUTUTLINE; + reply.header.size = sizeof (endutent_reply); + reply.header.type = UTMPD_REQ_ENDUTENT; if (send_request (sock, &request.header, &reply.header) < 0) return -1; @@ -392,11 +369,11 @@ do_updwtmp (int sock, const char *file, const struct utmp *utmp) size_t size; size = sizeof (updwtmp_request) + strlen (file) + 1; - + request = malloc (size); if (request == NULL) return -1; - + request->header.version = UTMPD_VERSION; request->header.size = size; request->header.type = UTMPD_REQ_UPDWTMP; diff --git a/login/utmp_file.c b/login/utmp_file.c index 6d6e05b292..bea63644f7 100644 --- a/login/utmp_file.c +++ b/login/utmp_file.c @@ -18,13 +18,11 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <assert.h> #include <errno.h> #include <fcntl.h> -#include <limits.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> -#include <sys/stat.h> #include <unistd.h> #include <utmp.h> @@ -32,9 +30,10 @@ /* Descriptor for the file and position. */ -static int file_fd = INT_MIN; +static int file_fd = -1; static off_t file_offset; +/* Cache for the last read entry. */ static struct utmp last_entry; @@ -68,14 +67,14 @@ setutent_file (void) if (file_fd < 0) { const char *file_name = __libc_utmp_file_name; - + if (strcmp (__libc_utmp_file_name, _PATH_UTMP) == 0 && __access (_PATH_UTMP "x", F_OK) == 0) file_name = _PATH_UTMP "x"; else if (strcmp (__libc_utmp_file_name, _PATH_WTMP) == 0 && __access (_PATH_WTMP "x", F_OK) == 0) file_name = _PATH_WTMP "x"; - + file_fd = open (file_name, O_RDWR); if (file_fd == -1) { @@ -96,18 +95,8 @@ setutent_file (void) /* Make sure the entry won't match. */ last_entry.ut_type = -1; #endif - - return 1; -} - - -static void -endutent_file (void) -{ - if (file_fd >= 0) - close (file_fd); - file_fd = INT_MIN; + return 1; } @@ -117,11 +106,9 @@ getutent_r_file (struct utmp *buffer, struct utmp **result) ssize_t nbytes; struct flock fl; /* Information struct for locking. */ - /* Open utmp file if not already done. */ - if (file_fd == INT_MIN) - setutent_file (); + assert (file_fd >= 0); - if (file_fd == -1 || file_offset == -1l) + if (file_offset == -1l) { /* Not available. */ *result = NULL; @@ -131,12 +118,16 @@ getutent_r_file (struct utmp *buffer, struct utmp **result) /* XXX The following is not perfect. Instead of locking the file itself Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl> suggests to use an extra locking file. */ + /* XXX I think using an extra locking file does not solve the + problems. Instead we should set an alarm, which causes fcntl to + fail, as in ../nis/lckcache.c. + Mark Kettenis <kettenis@phys.uva.nl>. */ /* Try to get the lock. */ memset (&fl, '\0', sizeof (struct flock)); fl.l_type = F_RDLCK; fl.l_whence = SEEK_SET; - fcntl (file_fd, F_SETLKW, &fl); + fcntl (file_fd, F_SETLK, &fl); /* Read the next entry. */ nbytes = read (file_fd, &last_entry, sizeof (struct utmp)); @@ -162,62 +153,6 @@ getutent_r_file (struct utmp *buffer, struct utmp **result) } -/* For implementing this function we don't use the getutent_r function - because we can avoid the reposition on every new entry this way. */ -static int -getutline_r_file (const struct utmp *line, struct utmp *buffer, - struct utmp **result) -{ - struct flock fl; - - if (file_fd < 0 || file_offset == -1l) - { - *result = NULL; - return -1; - } - - /* Try to get the lock. */ - memset (&fl, '\0', sizeof (struct flock)); - fl.l_type = F_RDLCK; - fl.l_whence = SEEK_SET; - fcntl (file_fd, F_SETLKW, &fl); - - while (1) - { - /* Read the next entry. */ - if (read (file_fd, &last_entry, sizeof (struct utmp)) - != sizeof (struct utmp)) - { - __set_errno (ESRCH); - file_offset = -1l; - *result = NULL; - goto unlock_return; - } - file_offset += sizeof (struct utmp); - - /* Stop if we found a user or login entry. */ - if ( -#if _HAVE_UT_TYPE - 0 - (last_entry.ut_type == USER_PROCESS - || last_entry.ut_type == LOGIN_PROCESS) - && -#endif - !strncmp (line->ut_line, last_entry.ut_line, sizeof line->ut_line)) - break; - } - - memcpy (buffer, &last_entry, sizeof (struct utmp)); - *result = buffer; - -unlock_return: - /* And unlock the file. */ - fl.l_type = F_UNLCK; - fcntl (file_fd, F_SETLKW, &fl); - - return ((*result == NULL) ? -1 : 0); -} - - static int proc_utmp_eq (const struct utmp *entry, const struct utmp *match) { @@ -308,7 +243,7 @@ internal_getut_r (const struct utmp *id, struct utmp *buffer) unlock_return: /* And unlock the file. */ fl.l_type = F_UNLCK; - fcntl (file_fd, F_SETLKW, &fl); + fcntl (file_fd, F_SETLK, &fl); return result; } @@ -320,7 +255,9 @@ static int getutid_r_file (const struct utmp *id, struct utmp *buffer, struct utmp **result) { - if (file_fd < 0 || file_offset == -1l) + assert (file_fd >= 0); + + if (file_offset == -1l) { *result = NULL; return -1; @@ -339,6 +276,64 @@ getutid_r_file (const struct utmp *id, struct utmp *buffer, } +/* For implementing this function we don't use the getutent_r function + because we can avoid the reposition on every new entry this way. */ +static int +getutline_r_file (const struct utmp *line, struct utmp *buffer, + struct utmp **result) +{ + struct flock fl; + + assert (file_fd >= 0); + + if (file_offset == -1l) + { + *result = NULL; + return -1; + } + + /* Try to get the lock. */ + memset (&fl, '\0', sizeof (struct flock)); + fl.l_type = F_RDLCK; + fl.l_whence = SEEK_SET; + fcntl (file_fd, F_SETLKW, &fl); + + while (1) + { + /* Read the next entry. */ + if (read (file_fd, &last_entry, sizeof (struct utmp)) + != sizeof (struct utmp)) + { + __set_errno (ESRCH); + file_offset = -1l; + *result = NULL; + goto unlock_return; + } + file_offset += sizeof (struct utmp); + + /* Stop if we found a user or login entry. */ + if ( +#if _HAVE_UT_TYPE - 0 + (last_entry.ut_type == USER_PROCESS + || last_entry.ut_type == LOGIN_PROCESS) + && +#endif + !strncmp (line->ut_line, last_entry.ut_line, sizeof line->ut_line)) + break; + } + + memcpy (buffer, &last_entry, sizeof (struct utmp)); + *result = buffer; + +unlock_return: + /* And unlock the file. */ + fl.l_type = F_UNLCK; + fcntl (file_fd, F_SETLK, &fl); + + return ((*result == NULL) ? -1 : 0); +} + + static struct utmp * pututline_file (const struct utmp *data) { @@ -347,13 +342,7 @@ pututline_file (const struct utmp *data) struct utmp *pbuf; int found; - /* Open utmp file if not already done. */ - if (file_fd == INT_MIN) - setutent_file (); - - if (file_fd == -1) - /* Something went wrong. */ - return NULL; + assert (file_fd >= 0); /* Find the correct place to insert the data. */ if (file_offset > 0 @@ -375,7 +364,7 @@ pututline_file (const struct utmp *data) memset (&fl, '\0', sizeof (struct flock)); fl.l_type = F_WRLCK; fl.l_whence = SEEK_SET; - fcntl (file_fd, F_SETLKW, &fl); + fcntl (file_fd, F_SETLK, &fl); if (found < 0) { @@ -418,12 +407,22 @@ pututline_file (const struct utmp *data) unlock_return: /* And unlock the file. */ fl.l_type = F_UNLCK; - fcntl (file_fd, F_SETLKW, &fl); + fcntl (file_fd, F_SETLK, &fl); return pbuf; } +static void +endutent_file (void) +{ + assert (file_fd >= 0); + + close (file_fd); + file_fd = -1; +} + + static int updwtmp_file (const char *file, const struct utmp *utmp) { @@ -441,7 +440,7 @@ updwtmp_file (const char *file, const struct utmp *utmp) memset (&fl, '\0', sizeof (struct flock)); fl.l_type = F_WRLCK; fl.l_whence = SEEK_SET; - fcntl (fd, F_SETLKW, &fl); + fcntl (fd, F_SETLK, &fl); /* Remember original size of log file. */ offset = lseek (fd, 0, SEEK_END); diff --git a/login/utmpname.c b/login/utmpname.c index c0b6df2ce7..e0a78aff42 100644 --- a/login/utmpname.c +++ b/login/utmpname.c @@ -44,6 +44,7 @@ __utmpname (const char *file) /* Close the old file. */ (*__libc_utmp_jump_table->endutent) (); + __libc_utmp_jump_table = &__libc_utmp_unknown_functions; if (strcmp (file, __libc_utmp_file_name) != 0) { @@ -68,7 +69,6 @@ __utmpname (const char *file) } } - __libc_utmp_jump_table = &__libc_utmp_unknown_functions; result = 0; done: |