diff options
Diffstat (limited to 'login')
| -rw-r--r-- | login/Makefile | 2 | ||||
| -rw-r--r-- | login/getutent.c | 6 | ||||
| -rw-r--r-- | login/getutent_r.c | 5 | ||||
| -rw-r--r-- | login/login.c | 2 | ||||
| -rw-r--r-- | login/programs/database.c | 99 | ||||
| -rw-r--r-- | login/programs/request.c | 6 | ||||
| -rw-r--r-- | login/programs/utmpd.c | 19 | ||||
| -rw-r--r-- | login/utmp_file.c | 12 | ||||
| -rw-r--r-- | login/utmpx.h | 50 |
9 files changed, 148 insertions, 53 deletions
diff --git a/login/Makefile b/login/Makefile index 6ee21d2285..407330707b 100644 --- a/login/Makefile +++ b/login/Makefile @@ -22,7 +22,7 @@ subdir := login -headers := utmp.h bits/utmp.h lastlog.h pty.h +headers := utmp.h bits/utmp.h utmpx.h bits/utmpx.h lastlog.h pty.h routines := getutent getutent_r getutid getutline getutid_r getutline_r \ utmp_file utmp_daemon utmpname updwtmp diff --git a/login/getutent.c b/login/getutent.c index e9462db18d..eb99158592 100644 --- a/login/getutent.c +++ b/login/getutent.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 * -getutent (void) +__getutent (void) { struct utmp *result; @@ -34,3 +34,5 @@ getutent (void) return result; } +weak_alias (__getutent, getutent) +weak_alias (__getutent, getutxent) diff --git a/login/getutent_r.c b/login/getutent_r.c index 340e4747bd..a50e2786fd 100644 --- a/login/getutent_r.c +++ b/login/getutent_r.c @@ -63,6 +63,7 @@ __setutent (void) __libc_lock_unlock (__libc_utmp_lock); } weak_alias (__setutent, setutent) +weak_alias (__setutent, setutxent) static int @@ -105,6 +106,7 @@ __endutent (void) __libc_lock_unlock (__libc_utmp_lock); } weak_alias (__endutent, endutent) +weak_alias (__endutent, endutxent) static void @@ -154,8 +156,9 @@ __pututline (const struct utmp *data) return buffer; } weak_alias (__pututline, pututline) +weak_alias (__pututline, pututxline) - + static struct utmp * pututline_unknown (const struct utmp *data) { diff --git a/login/login.c b/login/login.c index cf8632daab..075ef15056 100644 --- a/login/login.c +++ b/login/login.c @@ -43,7 +43,7 @@ tty_name (int fd, char **tty, size_t buf_len) { rv = ttyname_r (fd, buf, buf_len); - if (rv < 0 || memchr (buf, '\0', buf_len)) + if (rv != 0 || memchr (buf, '\0', buf_len)) /* We either got an error, or we succeeded and the returned name fit in the buffer. */ break; diff --git a/login/programs/database.c b/login/programs/database.c index 3138ae605c..087ec54d26 100644 --- a/login/programs/database.c +++ b/login/programs/database.c @@ -42,13 +42,13 @@ static int replace_entry (utmp_database *database, int old_position, int new_position, const struct utmp *entry); static int store_entry (utmp_database *database, int position, const struct utmp *entry); -static int get_mtime (const char *file, time_t *timer); +static int get_mtime (int filedes, time_t *timer); -/* Open the database specified by FILE and merge it with the - contents of the old format file specified by OLD_FILE. Returns a - pointer to a newly allocated structure describing the database, or - NULL on error. */ +/* Open the database specified by FILE and merge it with the contents + of the old format file specified by OLD_FILE. Returns a pointer to + a newly allocated structure describing the database, or NULL on + error. */ utmp_database * open_database (const char *file, const char *old_file) { @@ -57,31 +57,54 @@ open_database (const char *file, const char *old_file) /* Allocate memory. */ database = (utmp_database *) malloc (sizeof (utmp_database)); if (database == NULL) - return NULL; + { + error (0, 0, _("memory exhausted")); + return NULL; + } memset (database, 0, sizeof (utmp_database)); - /* Open database. */ - database->fd = open (file, O_RDWR); + /* Open database, create it if it doesn't exist already. */ + database->fd = open (file, O_RDWR | O_CREAT); if (database->fd < 0) - goto fail; + { + error (0, errno, "%s", file); + goto return_error; + } - database->old_fd = open (old_file, O_RDWR); - if (database->old_fd < 0) - goto fail; + database->file = strdup (file); + if (database->file == NULL) + { + error (0, 0, _("memory exhausted")); + goto return_error; + } + + if (old_file) + { + database->old_fd = open (old_file, O_RDWR); + if (database->old_fd < 0) + { + error (0, errno, "%s", old_file); + goto return_error; + } - if ((file && !(database->file = strdup (file))) - || (old_file && !(database->old_file = strdup (old_file)))) - goto fail; + database->old_file = strdup (old_file); + if (database->old_file == NULL) + { + error (0, 0, _("memory exhausted")); + goto return_error; + } + } - if (initialize_database (database) < 0 - || synchronize_database (database) < 0) - goto fail; + /* Initialize database. */ + if (initialize_database (database) < 0) + goto return_error; return database; -fail: +return_error: close_database (database); + return NULL; } @@ -100,8 +123,12 @@ synchronize_database (utmp_database *database) curtime = time (NULL); - if (get_mtime (database->old_file, &mtime) < 0) - return -1; + 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) { @@ -118,7 +145,10 @@ synchronize_database (utmp_database *database) || !compare_entry (&old_entry, &entry)) { if (write_entry (database, position, &old_entry) < 0) - return -1; + { + error (0, errno, "%s", database->file); + return -1; + } } position++; @@ -325,13 +355,19 @@ initialize_database (utmp_database *database) || entry.ut_type == OLD_TIME || entry.ut_type == NEW_TIME) { if (store_state_entry (database, position, &entry) < 0) - return -1; + { + error (0, errno, "%s", database->file); + return -1; + } } else #endif { if (store_process_entry (database, position, &entry) < 0) - return -1; + { + error (0, errno, "%s", database->file); + return -1; + } } /* Update position. */ @@ -344,14 +380,17 @@ initialize_database (utmp_database *database) break; if (write_old_entry (database, position, &entry) < 0) - return -1; + { + error (0, errno, "%s", database->file); + return -1; + } /* Update position. */ position++; } } - return 0; + return synchronize_database (database); } @@ -472,14 +511,14 @@ store_entry (utmp_database *database, int position, } -/* Get modification time of FILE and put it in TIMER. returns 0 if - successful, -1 if not. */ +/* Get modification time of the file with file descriptor FILEDES and + put it in TIMER. Returns 0 if successful, -1 if not. */ static int -get_mtime (const char *file, time_t *timer) +get_mtime (int filedes, time_t *timer) { struct stat st; - if (stat (file, &st) < 0) + if (fstat (filedes, &st) < 0) return -1; *timer = st.st_mtime; diff --git a/login/programs/request.c b/login/programs/request.c index 5e6bfa19cf..889ce0cba9 100644 --- a/login/programs/request.c +++ b/login/programs/request.c @@ -88,7 +88,7 @@ read_data (client_connection *connection) } if (nbytes < 0) - error (0, errno, "cannot read from client"); + error (0, errno, _("cannot read from client")); return -1; } @@ -117,7 +117,7 @@ write_data (client_connection *connection) } if (nbytes < 0) - error (0, errno, "cannot write to client"); + error (0, errno, _("cannot write to client")); return -1; } @@ -164,7 +164,7 @@ send_reply (client_connection *connection, const reply_header *reply) /* Check if the reply fits in the buffer. */ if ((size_t) (connection->write_end - connection->write_ptr) < reply->size) { - error (0, 0, "buffer overflow"); + error (0, 0, _("buffer overflow")); return -1; } diff --git a/login/programs/utmpd.c b/login/programs/utmpd.c index 3c8d626a84..2fef776a69 100644 --- a/login/programs/utmpd.c +++ b/login/programs/utmpd.c @@ -139,12 +139,12 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ /* Check if we are already running. */ if (check_pid (_PATH_UTMPDPID)) - error (EXIT_FAILURE, 0, "already running"); + error (EXIT_FAILURE, 0, _("already running")); /* Open UTMP database. */ utmp_db = open_database (_PATH_UTMP "x", _PATH_UTMP); if (utmp_db == NULL) - error (EXIT_FAILURE, errno, "%s", _PATH_UTMP); + exit (EXIT_FAILURE); /* Create sockets, with the right permissions. */ mask = umask (S_IXUSR | S_IXGRP | S_IXOTH); @@ -156,7 +156,8 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ /* Set the sockets up to accept connections. */ if (listen (ro_sock, MAX_CONNECTIONS) < 0 || listen (rw_sock, MAX_CONNECTIONS) < 0) - error (EXIT_FAILURE, errno, "cannot enable socket to accept connections"); + error (EXIT_FAILURE, errno, + _("cannot enable socket to accept connections")); /* Behave like a daemon. */ if (!debug) @@ -164,7 +165,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ openlog ("utmpd", LOG_CONS | LOG_ODELAY, LOG_DAEMON); if (daemon (0, 0) < 0) - error (EXIT_FAILURE, errno, "cannot auto-background"); + error (EXIT_FAILURE, errno, _("cannot auto-background")); forked = 1; if (write_pid (_PATH_UTMPDPID) < 0) @@ -235,7 +236,7 @@ make_socket (const char *name) /* Create the socket. */ sock = socket (PF_UNIX, SOCK_STREAM, 0); if (sock < 0) - error (EXIT_FAILURE, errno, "cannot create socket"); + error (EXIT_FAILURE, errno, _("cannot create socket")); /* Bind a name to the socket. */ addr.sun_family = AF_UNIX; @@ -277,7 +278,7 @@ void handle_requests (void) read_fd_set = active_read_fd_set; write_fd_set = active_write_fd_set; if (select (FD_SETSIZE, &read_fd_set, &write_fd_set, NULL, NULL) < 0) - error (EXIT_FAILURE, errno, "cannot get input on sockets"); + error (EXIT_FAILURE, errno, _("cannot get input on sockets")); /* Service all the sockets with input pending. */ for (fd = 0; fd < FD_SETSIZE; fd++) @@ -290,7 +291,7 @@ void handle_requests (void) connection = accept_connection (fd, access); if (connection == NULL) - error (0, errno, "cannot accept connection"); + error (0, errno, _("cannot accept connection")); FD_SET (connection->sock, &active_read_fd_set); } @@ -298,7 +299,7 @@ void handle_requests (void) { connection = find_connection (fd); if (connection == NULL) - error (EXIT_FAILURE, 0, "cannot find connection"); + error (EXIT_FAILURE, 0, _("cannot find connection")); if (read_data (connection) < 0) { @@ -316,7 +317,7 @@ void handle_requests (void) { connection = find_connection (fd); if (connection == NULL) - error (EXIT_FAILURE, 0, "cannot find connection"); + error (EXIT_FAILURE, 0, _("cannot find connection")); if (write_data (connection) < 0) { diff --git a/login/utmp_file.c b/login/utmp_file.c index 51b33226e0..4e218d8baa 100644 --- a/login/utmp_file.c +++ b/login/utmp_file.c @@ -170,7 +170,7 @@ 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; @@ -215,7 +215,7 @@ unlock_return: fl.l_type = F_UNLCK; fcntl (file_fd, F_SETLKW, &fl); - return ((result == NULL) ? -1 : 0); + return ((*result == NULL) ? -1 : 0); } @@ -251,7 +251,7 @@ internal_getut_r (const struct utmp *id, struct utmp *buffer) { int result = -1; struct flock fl; - + /* Try to get the lock. */ memset (&fl, '\0', sizeof (struct flock)); fl.l_type = F_RDLCK; @@ -432,7 +432,7 @@ updwtmp_file (const char *file, const struct utmp *utmp) struct flock fl; off_t offset; int fd; - + /* Open WTMP file. */ fd = open (file, O_WRONLY); if (fd < 0) @@ -443,7 +443,7 @@ updwtmp_file (const char *file, const struct utmp *utmp) fl.l_type = F_WRLCK; fl.l_whence = SEEK_SET; fcntl (fd, F_SETLKW, &fl); - + /* Remember original size of log file. */ offset = lseek (fd, 0, SEEK_END); if (offset % sizeof (struct utmp) != 0) @@ -465,7 +465,7 @@ updwtmp_file (const char *file, const struct utmp *utmp) } result = 0; - + unlock_return: /* And unlock the file. */ fl.l_type = F_UNLCK; diff --git a/login/utmpx.h b/login/utmpx.h new file mode 100644 index 0000000000..5873bf9310 --- /dev/null +++ b/login/utmpx.h @@ -0,0 +1,50 @@ +/* Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + 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. */ + +#ifndef _UTMPX_H +#define _UTMPX_H 1 + +#include <features.h> + +__BEGIN_DECLS + +/* Get system dependent values and data structures. */ +#include <bits/utmpx.h> + +/* Open user accounting database. */ +extern void *setutxent __P ((void)); + +/* Close user accounting database. */ +extern void endutxent __P ((void)); + +/* Get the next entry from the user accounting database. */ +extern struct utmpx *getutxent __P ((void)); + +/* Get the user accounting database entry corresponding to ID. */ +extern struct utmpx *getutxid __P ((const struct utmpx *__id)); + +/* Get the user accounting database entry corresponding to LINE. */ +extern struct utmpx *getutxline __P ((const struct utmpx *__line)); + +/* Write the entry UTMPX into the user accounting database. */ +extern struct utmpx *pututxline __P ((const struct utmpx *__utmpx)); + +__END_DECLS + +#endif /* utmpx.h */ |