mirror of
https://sourceware.org/git/glibc.git
synced 2024-10-03 20:47:42 +00:00
714a562f0b
<1997-06-12 21:22 Ulrich Drepper <drepper@cygnus.com> * Makefile (libc-map): Define before including Makerules. * Makerules (lib%.so): Depend on $(lib%-map). (build-shlib): Adapt rule for above change. (libc.so): Depend on $(libc-map). * db/Makefile (libcdb-map): New definition. * elf/Makefile (libdl-map): New definition. * elf/dl-lookup.c: Don't use relative include path. (undefined_msg): New variable. Use single string in all functions. (do_lookup): Correctly recognize default version. Return -2 if no version information is available. Stop processing hash entries when string was found. Don't bark about missing versioned symbol in file with original reference if it is a weak symbol. (_dl_lookup_symbol): Use undefined_msg. (_dl_lookup_versioned_symbol): Likewise. Give extra information if no verdef info is available. * elf/dl-version.c (file_needed): Remove first argument. We must seek in the whole search list. (match_symbol): Correct check for available verdef info. (_dl_check_map_versions): Correct call of find_needed. * locale/Makefile (libBrokenLocale-map): New definition. * login/Makefile (libutil-map): New definition. * math/Makefile (libm-map): New definition. * md5-crypt/Makefile (libcrypt-map): New definition. * nis/Makefile (libnsl-map, libnss_compat-map, libnss_nis-map, libnss_nisplus-map): New definition. * nss/Makefile (libnss_files-map, libnss_db-map): New definitions. * resolv/Makefile (libresolv-map, libnss_dns-map): New definitions. * libc.map: New file. * db/libdb.map: New file. * elf/libdl.map: New file. * locale/libBrokenLocale.map: New file. * login/libutil.map: New file. * math/libm.map: New file. * md5-crypt/libcrypt.map: New file. * nis/libnss_compat.map: New file. * nis/libnsl.map: New file. * nis/libnss_nis.map: New file. * nis/libnss_nisplus.map: New file. * nss/libnss_files.map: New file. * nss/libnss_db.map: New file. * resolv/libnss_dns.map: New file. * resolv/libresolv.map: New file. * sysdeps/i386/dl-machine.h (elf_machine_rel): Don't do anything for R_386_NONE entries. * Makefile (manual/dir-add.info): New rule. * Makerules: Add vpath definition for .x files. * Makerules (distinfo): Make sure target directory exists. * argp/argp-help.c (argp_args_usage): Don't modify `fdoc' value since it is used to distinguish filtered strings from unmodifed strings. * elf/dl-lookup.c (do_lookup): Optimize STT_* recognition. * elf/dl-reloc.c: Fix typo. * inet/arpa/tftp.h (struct tftphdr): Change type of tu_block to `unsigned short'. * manual/Makefile (dir-add.texi): Also emit wrapper text for info/install-info. (distribute): Add dir-add.texi and dir-add.info. (mostlyclean): Add dir-add.info. (realclean): Add dir-add.texi. (install): Add entries in `dir' file using install-info. * manual/libc.texinfo: Add @dircategory and @direntry text. Reported by Miles Bader <miles@gnu.ai.mit.edu>. * manual/pattern.texi: Correct description of GLOB_MAGCHAR and GLOB_NOMAGIC. Changes by Roland McGrath <roland@gnu.ai.mit.edu>. * nis/nis_addmember.c: Little optimizations. * nis/nis_call.c: Likewise. * nis/nis_creategroup.c: Likewise. * nis/nis_defaults.c: Likewise. * nis/nis_destroygroup.c: Likewise. * nis/nis_ismember.c: Likewise. * nis/nis_local_names.c: Likewise. * nis/nis_print_group_entry.c: Likewise. * nis/nis_verifygroup.c: Likewise. * posix/unistd.h: Fix comment for getcwd. * stdlib/Makefile (headers): Remove inttypes.h. It's a system dependent header. * sysdeps/wordsize-32/Dist: New file. * sysdeps/wordsize-32/Makefile: New file. * sysdeps/wordsize-64/Dist: New file. * sysdeps/wordsize-64/Makefile: New file. * sunrpc/Makefile: Adopt comment for real situation. * sysdeps/i386/add_n.S: Add ASM_TYPE_DIRECTIVE and AS_SIZE_DIRECTIVE. * sysdeps/i386/addmul_1.s: Likewise. * sysdeps/i386/lshist.s: Likewise. * sysdeps/i386/rshift.s: Likewise. * sysdeps/i386/sub_n.s: Likewise. * sysdeps/i386/submul_1.s: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.h (SYSCALL_ERROR_HANDLER): Add .type and .size. 1997-06-12 13:32 Philip Blundell <Philip.Blundell@pobox.com> * libc/sysdeps/unix/arm/brk.S: New file. * libc/sysdeps/unix/arm/sysdep.S: Likewise. * libc/sysdeps/unix/sysv/linux/arm/sysdep.S: Likewise. 1997-06-11 11:51 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nss_nisplus/nisplus-spwd.c (_nss_nisplus_parse_spent): Check if we have shadow information. 1997-06-08 19:33 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nis_getservlist.c (nis_getservlist): Use calloc instead of malloc, alloc memory for nis_server struct. * nis/nis_getservlist.c (nis_freeservlist): Give the memory for the nis_server struct free, too. * nis/nis_removemember (nis_removemember): Fix for loop. 1997-06-12 12:45 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/fpu/__math.h (__M_SQRT2): Define here since we cannot rely on M_SQRT2 being defined. (log1p): Use __M_SQRT2 not M_SQRT2. * math/math.h (_Mldbl): Define even if M_* constants are not defined. Reported by corsepiu@faw.uni-ulm.de. 1997-06-12 03:08 Philip Blundell <Philip.Blundell@pobox.com> * nss/getXXbyYY_r.c (do_weak_alias): Remove extra parentheses. 1997-06-11 13:22 Ulrich Drepper <drepper@cygnus.com> * misc/regexp.h (compile): Allow use of macro INIT for variable declaration. Add documentation for INIT. Reported by Robert Bihlmeyer <robbe@orcus.priv.at>. 1997-06-11 10:47 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/net/if_arp.h: Add two new hardware types. 1997-06-10 11:31 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/powerpc/strlen.s: Use -0x101 instead of 0xfffffeff for a signed 16-bit value. 1997-06-07 07:54 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c (_dl_sysdep_read_whole_file): Deleted. * sysdeps/powerpc/fenvbits.h (__FE_ALL_INVALID): Changed to FE_ALL_INVALID. * sysdeps/powerpc/fraiseexcpt.c (__FE_INVALID_SOFTWARE): Changed to FE_INVALID_SOFTWARE. (__FPSCR_STICKY_BITS): Changed to FPSCR_STICKY_BITS. * sysdeps/libm-ieee754/s_fmin.c: Fix a typo. 1997-06-07 18:48 H.J. Lu <hjl@gnu.ai.mit.edu> * shlib-versions (.*-.*-linux.*): Set libc to 6. 1997-06-08 15:35 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nis_add.c (nis_add): Use nis_leaf_of_r instead of nis_name_of_r. * nis/nis_addmember.c (nis_addmember): Fix a lot of pointer errors. * nis/nis_clone.c: Likewise. * nis/nis_removemember.c (nis_removemember): Likewise. * nis/nis_table.c: Likewise. * nis/nss_nis/nis-hosts.c: Use addr, not p for inet_pton call. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nis/nis-netgrp.c (_nss_nis_setnetgrent): Check for group == NULL. 1997-06-08 21:21 Mark Kettenis <kettenis@phys.uva.nl> * login/login.c, login/utmp_daemon.c, login/utmp_file.c, login/getutent_r.c, login/utmpname.c: Cleanup `#if _LIBC' and `#ifndef _LIBC' fragments. * login/programs/utmpd.c: Define DEFAULT_USER. (drop_priviliges): Use it. (main): Set locale and text domain. * login/programs/utmpd-private.h: Declare proc_utmp_eq. * login/programs/database.c (proc_utmp_eq): Removed. * login/programs/request.c (proc_utmp_eq): Made global. Only use ut_id field if valid. * login/utmp_file.c (proc_utmp_eq): Restore patch made by Miles Bader that was lost when adding the daemon backend; Only use ut_id field if valid. 1997-06-05 23:10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/Dist: Remove netatalk/atalk.h and netinet/icmp.h, add netatalk/at.h. * sysdeps/unix/sysv/linux/powerpc/Dist: Remove termios.h. * sysdeps/unix/sysv/linux/sparc/Dist: Remove start.c. 1997-06-04 19:22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdlib/testsort.c (compare): Fix parameter types. 1997-06-04 19:05 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * md5-crypt/Makefile (distribute): Fix name of file. 1997-06-04 19:02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * login/Makefile (utmpd-routines): Remove utmpd again, which is already added implicitly through $(others). 1997-06-05 13:43 Fila Kolodny <fila@filapc.ibi.com> * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add netipx/ipx.h. 1997-06-05 13:25 Andreas Jaeger <aj@arthur.rhein-neckar.de> * md5-crypt/md5-crypt.c: Add prototype for __md5_crypt. 1997-06-05 17:08 Ulrich Drepper <drepper@cygnus.com> * string/argz-addsep.c: Correct weak alias. Reported by Ben Pfaff <pfaffben@pilot.msu.edu>. * locale/setlocale.c (setlocale): Free variable with locale path before returning. (setname): Don't test for _nl_current[category] being NULL before freeing. Reported by Ben Pfaff <pfaffben@pilot.msu.edu>. 1997-06-04 12:41 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/intro.texi (XPG): Correct some typos. * manual/libc.texinfo (Program Arguments): Menu updated. * nis/nis_local_names.c (nis_local_host): Fix pointer errors.
652 lines
16 KiB
C
652 lines
16 KiB
C
/* 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. */
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <utmp.h>
|
|
|
|
#include "utmpd.h"
|
|
#include "utmpd-private.h"
|
|
|
|
|
|
/* Prototypes for the local functions. */
|
|
static int process_request (client_connection *connection);
|
|
static int send_reply (client_connection *connect, const reply_header *reply);
|
|
|
|
static int do_setutent (client_connection *connection);
|
|
static int do_getutent (client_connection *connection);
|
|
static int do_endutent (client_connection *connection);
|
|
static int do_getutline (client_connection *connection);
|
|
static int do_getutid (client_connection *connection);
|
|
static int do_pututline (client_connection *connection);
|
|
static int do_updwtmp (client_connection *connection);
|
|
|
|
static int internal_getut_r (client_connection *connection,
|
|
const struct utmp *id, struct utmp *buffer);
|
|
|
|
|
|
/* Read data from the client on CONNECTION. */
|
|
int
|
|
read_data (client_connection *connection)
|
|
{
|
|
ssize_t nbytes;
|
|
|
|
assert (connection);
|
|
assert ((connection->read_end - connection->read_ptr) > 0);
|
|
|
|
/* Read data. */
|
|
nbytes = read (connection->sock, connection->read_ptr,
|
|
connection->read_end - connection->read_ptr);
|
|
if (nbytes > 0)
|
|
{
|
|
size_t total_bytes;
|
|
|
|
/* Update read pointer. */
|
|
connection->read_ptr += nbytes;
|
|
|
|
/* Check if we have a complete request header. */
|
|
total_bytes = connection->read_ptr - connection->read_base;
|
|
if (total_bytes >= sizeof (request_header))
|
|
{
|
|
request_header *header;
|
|
|
|
/* Check if we have a complete request. */
|
|
header = (request_header *)connection->read_base;
|
|
if (total_bytes >= header->size)
|
|
{
|
|
/* Process the request. */
|
|
if (process_request (connection) < 0)
|
|
return -1;
|
|
|
|
/* Adjust read pointer, and flush buffer. */
|
|
connection->read_ptr -= header->size;
|
|
memmove (connection->read_base,
|
|
connection->read_base + header->size,
|
|
connection->read_ptr - connection->read_base);
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
if (nbytes < 0)
|
|
error (0, errno, "cannot read from client");
|
|
|
|
return -1;
|
|
}
|
|
|
|
|
|
/* Write data to the client on CONNECTION. */
|
|
int
|
|
write_data (client_connection *connection)
|
|
{
|
|
ssize_t nbytes;
|
|
|
|
assert (connection);
|
|
assert ((connection->write_ptr - connection->write_base) > 0);
|
|
|
|
/* Write data. */
|
|
nbytes = write (connection->sock, connection->write_base,
|
|
connection->write_ptr - connection->write_base);
|
|
if (nbytes > 0)
|
|
{
|
|
/* Adjust write pointer and flush buffer. */
|
|
connection->write_ptr -= nbytes;
|
|
memmove (connection->write_base, connection->write_base + nbytes,
|
|
connection->write_ptr - connection->write_base);
|
|
|
|
return 0;
|
|
}
|
|
|
|
if (nbytes < 0)
|
|
error (0, errno, "cannot write to client");
|
|
|
|
return -1;
|
|
}
|
|
|
|
|
|
/* Process the request received on CONNECTION. Returns 0 if
|
|
successful, -1 if not. */
|
|
static int
|
|
process_request (client_connection *connection)
|
|
{
|
|
request_header *header;
|
|
|
|
assert (connection);
|
|
assert (connection->read_base);
|
|
|
|
header = (request_header *)connection->read_base;
|
|
if (header->version != UTMPD_VERSION)
|
|
{
|
|
warning (EINVAL, "invalid protocol version");
|
|
return -1;
|
|
}
|
|
|
|
switch (header->type)
|
|
{
|
|
case UTMPD_REQ_SETUTENT: return do_setutent (connection);
|
|
case UTMPD_REQ_GETUTENT: return do_getutent (connection);
|
|
case UTMPD_REQ_ENDUTENT: return do_endutent (connection);
|
|
case UTMPD_REQ_GETUTLINE: return do_getutline (connection);
|
|
case UTMPD_REQ_GETUTID: return do_getutid (connection);
|
|
case UTMPD_REQ_PUTUTLINE: return do_pututline (connection);
|
|
case UTMPD_REQ_UPDWTMP: return do_updwtmp (connection);
|
|
default:
|
|
warning (EINVAL, "invalid request type");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
|
|
/* Send the reply specified by HEADER to the client on CONNECTION.
|
|
Returns 0 if successful, -1 if not. */
|
|
static int
|
|
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");
|
|
return -1;
|
|
}
|
|
|
|
/* Copy reply to buffer, and adjust write pointer. */
|
|
memcpy (connection->write_ptr, reply, reply->size);
|
|
connection->write_ptr += reply->size;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
do_setutent (client_connection *connection)
|
|
{
|
|
setutent_request *request;
|
|
setutent_reply reply;
|
|
|
|
request = (setutent_request *)connection->read_base;
|
|
if (request->header.size != sizeof (setutent_request))
|
|
{
|
|
warning (EINVAL, "invalid request size");
|
|
return -1;
|
|
}
|
|
|
|
/* Initialize reply. */
|
|
reply.header.version = UTMPD_VERSION;
|
|
reply.header.size = sizeof (setutent_reply);
|
|
reply.header.type = UTMPD_REQ_SETUTENT;
|
|
|
|
/* Select database. */
|
|
if (!strncmp (request->file, _PATH_UTMP, sizeof request->file))
|
|
connection->database = utmp_db;
|
|
else
|
|
{
|
|
errno = EINVAL;
|
|
goto return_error;
|
|
}
|
|
|
|
/* Initialize position pointer. */
|
|
connection->position = 0;
|
|
|
|
#if _HAVE_UT_TYPE - 0
|
|
/* Make sure the entry won't match. */
|
|
connection->last_entry.ut_type = -1;
|
|
#endif
|
|
|
|
reply.errnum = 0;
|
|
reply.result = 0;
|
|
return send_reply (connection, &reply.header);
|
|
|
|
return_error:
|
|
reply.errnum = errno;
|
|
reply.result = -1;
|
|
return send_reply (connection, &reply.header);
|
|
}
|
|
|
|
|
|
static int
|
|
do_getutent (client_connection *connection)
|
|
{
|
|
getutent_request *request;
|
|
getutent_reply reply;
|
|
|
|
request = (getutent_request *)connection->read_base;
|
|
if (request->header.size != sizeof (getutent_request))
|
|
{
|
|
warning (EINVAL, "invalid request size");
|
|
return -1;
|
|
}
|
|
|
|
/* Initialize reply. */
|
|
reply.header.version = UTMPD_VERSION;
|
|
reply.header.size = sizeof (getutent_reply);
|
|
reply.header.type = UTMPD_REQ_GETUTENT;
|
|
|
|
if (connection->database == NULL || connection->position == -1)
|
|
{
|
|
errno = ESRCH;
|
|
goto return_error;
|
|
}
|
|
|
|
/* Make sure we're in synch with the ordinary file. */
|
|
if (synchronize_database (connection->database) < 0)
|
|
{
|
|
errno = ESRCH;
|
|
goto return_error;
|
|
}
|
|
|
|
/* Read the next entry from the database. */
|
|
if (read_entry (connection->database, connection->position,
|
|
&connection->last_entry) < 0)
|
|
{
|
|
connection->position = -1;
|
|
errno = ESRCH;
|
|
goto return_error;
|
|
}
|
|
|
|
/* Update position pointer. */
|
|
connection->position++;
|
|
|
|
memcpy (&reply.entry, &connection->last_entry, sizeof (struct utmp));
|
|
reply.errnum = 0;
|
|
reply.result = 0;
|
|
return send_reply (connection, (reply_header *)&reply);
|
|
|
|
return_error:
|
|
memset (&reply.entry, 0, sizeof (struct utmp));
|
|
reply.errnum = errno;
|
|
reply.result = -1;
|
|
return send_reply (connection, &reply.header);
|
|
}
|
|
|
|
|
|
static int
|
|
do_endutent (client_connection *connection)
|
|
{
|
|
endutent_request *request;
|
|
endutent_reply reply;
|
|
|
|
request = (endutent_request *)connection->read_base;
|
|
if (request->header.size != sizeof (endutent_request))
|
|
{
|
|
warning (EINVAL, "invalid request size");
|
|
return -1;
|
|
}
|
|
|
|
/* Deselect database. */
|
|
connection->database = NULL;
|
|
|
|
/* Formulate reply. */
|
|
reply.header.version = UTMPD_VERSION;
|
|
reply.header.size = sizeof (endutent_reply);
|
|
reply.header.type = UTMPD_REQ_ENDUTENT;
|
|
reply.errnum = 0;
|
|
reply.result = 0;
|
|
|
|
return send_reply (connection, &reply.header);
|
|
}
|
|
|
|
|
|
static int
|
|
do_getutline (client_connection *connection)
|
|
{
|
|
getutline_request *request;
|
|
getutline_reply reply;
|
|
|
|
request = (getutline_request *)connection->read_base;
|
|
if (request->header.size != sizeof (getutline_request))
|
|
{
|
|
warning (EINVAL, "invalid request size");
|
|
return -1;
|
|
}
|
|
|
|
/* Initialize reply. */
|
|
reply.header.version = UTMPD_VERSION;
|
|
reply.header.size = sizeof (getutline_reply);
|
|
reply.header.type = UTMPD_REQ_GETUTLINE;
|
|
|
|
if (connection->database == NULL || connection->position == -1)
|
|
{
|
|
errno = ESRCH;
|
|
goto return_error;
|
|
}
|
|
|
|
/* Make sure we're in synch with the ordinary file. */
|
|
if (synchronize_database (connection->database) < 0)
|
|
{
|
|
errno = ESRCH;
|
|
goto return_error;
|
|
}
|
|
|
|
while (1)
|
|
{
|
|
/* Read the next entry. */
|
|
if (read_entry (connection->database, connection->position,
|
|
&connection->last_entry) < 0)
|
|
{
|
|
connection->position = -1;
|
|
errno = ESRCH;
|
|
goto return_error;
|
|
}
|
|
connection->position++;
|
|
|
|
/* Stop if we found a user or login entry. */
|
|
if (
|
|
#if _HAVE_UT_TYPE - 0
|
|
(connection->last_entry.ut_type == USER_PROCESS
|
|
|| connection->last_entry.ut_type == LOGIN_PROCESS)
|
|
&&
|
|
#endif
|
|
!strncmp (request->line.ut_line, connection->last_entry.ut_line,
|
|
sizeof request->line.ut_line))
|
|
break;
|
|
}
|
|
|
|
memcpy (&reply.entry, &connection->last_entry, sizeof (struct utmp));
|
|
reply.errnum = 0;
|
|
reply.result = 0;
|
|
return send_reply (connection, &reply.header);
|
|
|
|
return_error:
|
|
memset (&reply.entry, 0, sizeof (struct utmp));
|
|
reply.errnum = errno;
|
|
reply.result = -1;
|
|
return send_reply (connection, &reply.header);
|
|
}
|
|
|
|
|
|
static int
|
|
do_getutid (client_connection *connection)
|
|
{
|
|
getutid_request *request;
|
|
getutid_reply reply;
|
|
|
|
request = (getutid_request *)connection->read_base;
|
|
if (request->header.size != sizeof (getutid_request))
|
|
{
|
|
warning (EINVAL, "invalid request size");
|
|
return -1;
|
|
}
|
|
|
|
/* Initialize reply. */
|
|
reply.header.version = UTMPD_VERSION;
|
|
reply.header.size = sizeof (getutid_reply);
|
|
reply.header.type = UTMPD_REQ_GETUTID;
|
|
|
|
if (connection->database == NULL || connection->position == -1)
|
|
{
|
|
errno = ESRCH;
|
|
goto return_error;
|
|
}
|
|
|
|
/* Make sure we're in synch with the ordinary file. */
|
|
if (synchronize_database (connection->database) < 0)
|
|
{
|
|
errno = ESRCH;
|
|
goto return_error;
|
|
}
|
|
|
|
if (internal_getut_r (connection, &request->id,
|
|
&connection->last_entry) < 0)
|
|
{
|
|
errno = ESRCH;
|
|
goto return_error;
|
|
}
|
|
|
|
reply.errnum = 0;
|
|
reply.result = 0;
|
|
memcpy (&reply.entry, &connection->last_entry, sizeof (struct utmp));
|
|
return send_reply (connection, &reply.header);
|
|
|
|
return_error:
|
|
memset (&reply.entry, 0, sizeof (struct utmp));
|
|
reply.errnum = errno;
|
|
reply.result = -1;
|
|
return send_reply (connection, &reply.header);
|
|
}
|
|
|
|
|
|
static int
|
|
do_pututline (client_connection *connection)
|
|
{
|
|
pututline_request *request;
|
|
pututline_reply reply;
|
|
struct utmp buffer;
|
|
int found;
|
|
|
|
request = (pututline_request *)connection->read_base;
|
|
if (request->header.size != sizeof (pututline_request))
|
|
{
|
|
warning (EINVAL, "invalid request size");
|
|
return -1;
|
|
}
|
|
|
|
/* Initialize reply. */
|
|
reply.header.version = UTMPD_VERSION;
|
|
reply.header.size = sizeof (pututline_reply);
|
|
reply.header.type = UTMPD_REQ_PUTUTLINE;
|
|
|
|
if (!(connection->access & W_OK))
|
|
{
|
|
errno = EPERM;
|
|
goto return_error;
|
|
}
|
|
|
|
if (connection->database == NULL || connection->position == -1)
|
|
{
|
|
errno = ESRCH;
|
|
goto return_error;
|
|
}
|
|
|
|
/* Make sure we're in synch with the ordinary file. */
|
|
if (synchronize_database (connection->database) < 0)
|
|
{
|
|
errno = ESRCH;
|
|
goto return_error;
|
|
}
|
|
|
|
/* Find the correct place to insert the data. */
|
|
if (connection->position > 0
|
|
&& (
|
|
#if _HAVE_UT_TYPE - 0
|
|
(connection->last_entry.ut_type == request->utmp.ut_type
|
|
&& (connection->last_entry.ut_type == RUN_LVL
|
|
|| connection->last_entry.ut_type == BOOT_TIME
|
|
|| connection->last_entry.ut_type == OLD_TIME
|
|
|| connection->last_entry.ut_type == NEW_TIME))
|
|
||
|
|
#endif
|
|
proc_utmp_eq (&connection->last_entry, &request->utmp)))
|
|
found = 1;
|
|
else
|
|
found = internal_getut_r (connection, &request->utmp, &buffer);
|
|
|
|
if (found < 0)
|
|
{
|
|
/* We append the next entry. */
|
|
connection->position =
|
|
append_entry (connection->database, &request->utmp);
|
|
if (connection->position < 0)
|
|
goto return_error;
|
|
}
|
|
else
|
|
{
|
|
/* We replace the just read entry. */
|
|
connection->position--;
|
|
if (write_entry (connection->database, connection->position,
|
|
&request->utmp) < 0)
|
|
goto return_error;
|
|
}
|
|
|
|
/* Write the entry to the compatibility file. */
|
|
write_old_entry (connection->database, connection->position, &request->utmp);
|
|
|
|
/* Update position pointer. */
|
|
connection->position++;
|
|
|
|
reply.errnum = 0;
|
|
reply.result = 0;
|
|
return send_reply (connection, &reply.header);
|
|
|
|
return_error:
|
|
reply.errnum = errno;
|
|
reply.result = -1;
|
|
return send_reply (connection, &reply.header);
|
|
}
|
|
|
|
|
|
static int
|
|
do_updwtmp (client_connection *connection)
|
|
{
|
|
updwtmp_request *request;
|
|
updwtmp_reply reply;
|
|
utmp_database *database;
|
|
|
|
request = (updwtmp_request *)connection->read_base;
|
|
if (request->header.size != sizeof (updwtmp_request))
|
|
{
|
|
warning (EINVAL, "invalid request size");
|
|
return -1;
|
|
}
|
|
|
|
/* Initialize reply. */
|
|
reply.header.version = UTMPD_VERSION;
|
|
reply.header.size = sizeof (updwtmp_reply);
|
|
reply.header.type = UTMPD_REQ_UPDWTMP;
|
|
|
|
if (!(connection->access & W_OK))
|
|
{
|
|
errno = EPERM;
|
|
goto return_error;
|
|
}
|
|
|
|
/* Select database. */
|
|
if (!strncmp (request->file, _PATH_UTMP, sizeof request->file))
|
|
database = utmp_db;
|
|
else
|
|
{
|
|
errno = EINVAL;
|
|
goto return_error;
|
|
}
|
|
|
|
/* Make sure we're in synch with the ordinary file. */
|
|
if (synchronize_database (database) < 0)
|
|
{
|
|
errno = ESRCH;
|
|
goto return_error;
|
|
}
|
|
|
|
/* Append the entry. */
|
|
if (append_entry (database, &request->utmp) < 0)
|
|
goto return_error;
|
|
|
|
reply.errnum = 0;
|
|
reply.result = 0;
|
|
return send_reply (connection, &reply.header);
|
|
|
|
return_error:
|
|
reply.errnum = errno;
|
|
reply.result = -1;
|
|
return send_reply (connection, &reply.header);
|
|
}
|
|
|
|
|
|
/* This function is identical to the one in login/utmp_file.c. */
|
|
int
|
|
proc_utmp_eq (const struct utmp *entry, const struct utmp *match)
|
|
{
|
|
return
|
|
(
|
|
#if _HAVE_UT_TYPE - 0
|
|
(entry->ut_type == INIT_PROCESS
|
|
|| entry->ut_type == LOGIN_PROCESS
|
|
|| entry->ut_type == USER_PROCESS
|
|
|| entry->ut_type == DEAD_PROCESS)
|
|
&&
|
|
(match->ut_type == INIT_PROCESS
|
|
|| match->ut_type == LOGIN_PROCESS
|
|
|| match->ut_type == USER_PROCESS
|
|
|| match->ut_type == DEAD_PROCESS)
|
|
&&
|
|
#endif
|
|
#if _HAVE_UT_ID - 0
|
|
(entry->ut_id[0] && match->ut_id[0]
|
|
? strncmp (entry->ut_id, match->ut_id, sizeof match->ut_id) == 0
|
|
: strncmp (entry->ut_line, match->ut_line, sizeof match->ut_line) == 0)
|
|
#else
|
|
strncmp (entry->ut_line, match->ut_line, sizeof match->ut_line) == 0
|
|
#endif
|
|
);
|
|
}
|
|
|
|
|
|
/* This function is derived from the one in login/utmp_file.c. */
|
|
static int
|
|
internal_getut_r (client_connection *connection,
|
|
const struct utmp *id, struct utmp *buffer)
|
|
{
|
|
#if _HAVE_UT_TYPE - 0
|
|
if (id->ut_type == RUN_LVL || id->ut_type == BOOT_TIME
|
|
|| id->ut_type == OLD_TIME || id->ut_type == NEW_TIME)
|
|
{
|
|
/* Search for next entry with type RUN_LVL, BOOT_TIME,
|
|
OLD_TIME, or NEW_TIME. */
|
|
|
|
while (1)
|
|
{
|
|
/* Read the next entry. */
|
|
if (read_entry (connection->database, connection->position,
|
|
buffer) < 0)
|
|
{
|
|
connection->position = -1;
|
|
return -1;
|
|
}
|
|
connection->position++;
|
|
|
|
if (id->ut_type == buffer->ut_type)
|
|
break;
|
|
}
|
|
}
|
|
else
|
|
#endif /* _HAVE_UT_TYPE */
|
|
{
|
|
/* Search for the next entry with the specified ID and with type
|
|
INIT_PROCESS, LOGIN_PROCESS, USER_PROCESS, or DEAD_PROCESS. */
|
|
|
|
while (1)
|
|
{
|
|
/* Read the next entry. */
|
|
if (read_entry (connection->database, connection->position,
|
|
buffer) < 0)
|
|
{
|
|
connection->position = -1;
|
|
return -1;
|
|
}
|
|
connection->position++;
|
|
|
|
if (proc_utmp_eq (buffer, id))
|
|
break;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|