mirror of
https://sourceware.org/git/glibc.git
synced 2024-10-03 20:47:42 +00:00
d705269e75
1997-06-19 19:38 Ulrich Drepper <drepper@cygnus.com> * features.h: Define __STDC_IEC_559__ and _STDC_IEC_559_COMPLEX__. * elf/dl-minimal.c (__dcgettext): Remove assertion. * inet/rcmd.c: Correct a few typos. Reported by Eric Troan. * manual/Makefile (distribute): Add dir. * manual/dir: New file. * math/Makefile (libm-support): Rename s_rinttol, s_rinttoll, s_roundtol, and s_roundtoll to s_lrint, s_llrint, s_lround, and s_llround respectively. (libm-calls): Add e_gamma_r. * math/libm-test.c (check_int_exc): New function. (signbit_test): Remove test for sign of NaN. (gamma_test): Clear exception after test of existence. Correct tests and and epsilons. (lgamma_test): Likewise. (ilogb_test): Correct all tests. (scalb_test): Rewrite. (rinttol_test): Rename to lrint_test and correct tests. (rinttoll_test): Likewise. (roundtol_test): Likewise. (roundtoll_test): Likewise. (main): Call lrint/lround functions instead of rinttol/roundtol. * math/math.h: Change prototypes for rinttol/roundtol. * math/mathcalls.h: Rearrange prototypes according to ISO C9X draft. * sysdeps/generic/mathbits.h: Define FP_ILOGB0 and FP_ILOGBNAN. * sysdeps/i386/mathbits.h: Likewise. * sysdeps/libm-i387/e_scalb.S: Handle special cases correctly. * sysdeps/libm-i387/e_scalbf.S: Likewise. * sysdeps/libm-i387/e_scalbl.S: Likewise. * sysdeps/libm-i387/s_asinh.S: Handle -inf correctly. * sysdeps/libm-i387/s_asinhf.S: Likewise. * sysdeps/libm-i387/s_asinhl.S: Likewise. * sysdeps/libm-i387/s_ilogb.S: Optimize. * sysdeps/libm-i387/s_ilogbf.S: Likewise. * sysdeps/libm-i387/s_ilogbl.S: Likewise. * sysdeps/libm-i387/s_rinttol.S: Rename to... * sysdeps/libm-i387/s_lrint.S: ...this. * sysdeps/libm-i387/s_rinttoll.S: Rename to... * sysdeps/libm-i387/s_llrint.S: ...this. * sysdeps/libm-i387/s_remquo.S: Correctly set sign of remainder. * sysdeps/libm-i387/s_remquof.S: Likewise. * sysdeps/libm-i387/s_remquol.S: Likewise. * sysdeps/libm-i387/e_gamma_r.c: New file. Implementation of gamma function according to ISO C. * sysdeps/libm-i387/e_gammaf_r.c: New file. * sysdeps/libm-i387/e_gammal_r.c: New file. * sysdeps/libm-i387/e_lgamma_r.c: Don't let optimize compile the generation of exceptions away. * sysdeps/libm-i387/e_lgammaf_r.c: Likewise. * sysdeps/libm-i387/k_standard.c: Correct return value for infinity points of gamma function when not SVID mode. * sysdeps/libm-i387/s_rinttoll.c: Renamed to... * sysdeps/libm-i387/s_llrint.c: ...this. * sysdeps/libm-i387/s_rinttol.c: Renamed to... * sysdeps/libm-i387/s_lrint.c: ...this. * sysdeps/libm-i387/s_roundtoll.c: Renamed to... * sysdeps/libm-i387/s_llround.c: ...this. * sysdeps/libm-i387/s_roundtol.c: Renamed to... * sysdeps/libm-i387/s_lround.c: ..this. * sysdeps/libm-i387/s_scalbn.c: Change second parameter according to ISO C. * sysdeps/libm-i387/s_scalbnf.c: Likewise. * sysdeps/libm-i387/s_scalbnl.c: Likewise. * sysdeps/libm-i387/w_gamma.c: Call __ieee754_gamma_r if library mode is not _SVID_. * sysdeps/libm-i387/w_gammaf.c: Likewise. * sysdeps/libm-i387/w_gammal.c: Likewise. * sysdeps/m68k/fpu/__math.h: Rename __rinttol to __lrint and rinttol to lrint. * sysdeps/m68k/fpu/s_rinttol.c: Renamed to... * sysdeps/m68k/fpu/s_lrint.c: ...this. * sysdeps/m68k/fpu/s_rinttoll.c: Renamed to... * sysdeps/m68k/fpu/s_llrint.c: ...this. * md5-crypt/Makefile: Link md5test program with md5.o. * stdio-common/temptest.c: Don't use __stdio_gen_tempname which is not exported by the libc.so. * stdio-common/vfscanf.c: Correct scanning of strings after last change. * sysdeps/unix/sysv/linux/i386/sysdep.S: Use .comm to define errno. 1997-06-19 07:37 H.J. Lu <hjl@gnu.ai.mit.edu> * time/tzfile.c (__tzfile_read): Store getc () return in int. 1997-06-13 Miles Bader <miles@gnu.ai.mit.edu> * argp/argp-parse.c (argp_version_parser): Include `(PROGRAM ERROR)' in the no-version error text to indicate that something's fucked. [!_] (N_): New macro. (argp_default_options, argp_version_options): Wrap doc strings in N_(). 1997-06-12 Miles Bader <miles@gnu.ai.mit.edu> * argp/argp-parse.c (parser_parse_opt): Detect and report unhandled options here. (parser_parse_arg): Handle ARGP_KEY_ARGS here. Adjust NEXT pointer back if we fail to parse anything. (parser_parse_next): Simplify arg code. Leave state NEXT frobbing to parser_parse_arg. 1997-06-11 Miles Bader <miles@gnu.ai.mit.edu> * argp/argp.h (ARGP_KEY_ARGS, ARGP_KEY_FINI): New macros. * argp/argp-parse.c (parser_finalize): Do another pass over the parsers with ARGP_KEY_FINI. 1997-06-18 Miles Bader <miles@gnu.ai.mit.edu> * string/Makefile (routines): Add argz-replace. 1997-06-16 00:16 Miles Bader <miles@gnu.ai.mit.edu> * manual/string.texi (Argz Functions): Document argz_replace. 1997-06-12 Miles Bader <miles@gnu.ai.mit.edu> * string/argz.h (__argz_replace, argz_replace): New declarations. * string/argz-replace.c: New file. 1997-06-11 Miles Bader <miles@gnu.ai.mit.edu> * manual/argp.texi (Argp Special Keys): Document ARGP_KEY_ARGS. 1997-06-16 23:08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig (libc-map): Remove definition. * Makerules (libc-map): Define it here, using the full name. (load-map-file): Remove case for empty $(..). ($(common-objpfx)libc.so): Revert last change. 1997-06-17 22:18 Mark Kettenis <kettenis@phys.uva.nl> * login/programs/utmpd.c (main): Improve signal handling. * login/programs/request.c (do_setutent, do_updwtmp): Allow arbitrary length filenames. * login/programs/utmpd.h (setutent_request, updwtmp_request): Get rid of fixed length file field. * login/utmp_daemon.c (do_setutent, do_updwtmp): Allow arbitrary length filenames. * login/programs/request.c (do_pututline): Don't fail if connection->position is -1 on entry. 1997-06-15 16:32 Mark Kettenis <kettenis@phys.uva.nl> * login/utmp_file.c (updwtmp_file): Use the same method for appending an entry as in pututline_file. 1997-06-11 18:59 Mark Kettenis <kettenis@phys.uva.nl> * login/utmp_file.c (getutent_r_file): Use read lock instead of write lock. (getutline_r_file, internal_getut_r): Lock utmp file. (updwtmp_file): Use fcntl to lock file instead of flock. 1997-06-18 00:11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdio-common/vfscanf.c (inchar, ungetc): Don't count EOF as character read in/put back. * stdio-common/tstscanf.c: Add test case for this. 1997-06-17 22:17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libc.map: Add more symbols. 1997-06-18 12:01 Ulrich Drepper <drepper@cygnus.com> * manual/Makefile (install): Make sure `dir' file exists if we use install-info. 1997-06-17 19:32 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/Makefile (info): Depend on dir-add.info. 1997-06-17 17:19 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/ldd.bash.in: Fix spacing in message. 1997-06-17 14:28 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/do-rel.h (elf_dynamic_do_rel): Always use version information if available. 1997-06-17 11:34 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sunrpc/Makefile ($(rpcsvc:%.x=$(objpfx)rpcsvc/%.h)): Make command non-empty to force make to recheck modification time. ($(rpcsvc:%.x=$(objpfx)x%.c)): Likewise. 1997-06-17 00:26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/stub/e_acoshl.c: Set errno to ENOSYS. * sysdeps/stub/e_acosl.c: Likewise. * sysdeps/stub/e_asinl.c: Likewise. * sysdeps/stub/e_atan2l.c: Likewise. * sysdeps/stub/e_expl.c: Likewise. * sysdeps/stub/e_fmodl.c: Likewise. * sysdeps/stub/e_j0l.c: Likewise. * sysdeps/stub/e_j1l.c: Likewise. * sysdeps/stub/e_jnl.c: Likewise. * sysdeps/stub/e_lgammal_r.c: Likewise. * sysdeps/stub/e_log10l.c: Likewise. * sysdeps/stub/e_logl.c: Likewise. * sysdeps/stub/e_powl.c: Likewise. * sysdeps/stub/e_rem_pio2l.c: Likewise. * sysdeps/stub/e_sqrtl.c: Likewise. * sysdeps/stub/k_cosl.c: Likewise. * sysdeps/stub/k_rem_pio2l.c: Likewise. * sysdeps/stub/k_sinl.c: Likewise. * sysdeps/stub/k_tanl.c: Likewise. * sysdeps/stub/s_atanl.c: Likewise. * sysdeps/stub/s_erfl.c: Likewise. * sysdeps/stub/s_exp2.c: Likewise. * sysdeps/stub/s_exp2f.c: Likewise. * sysdeps/stub/s_exp2l.c: Likewise. * sysdeps/stub/s_expm1l.c: Likewise. * sysdeps/stub/s_log1pl.c: Likewise. * sysdeps/stub/s_log2l.c: Likewise. 1997-06-18 11:46 Ulrich Drepper <drepper@cygnus.com> * sysdeps/libm-ieee754/w_gamma.c: If _LIB_VERSION is _SVID_ compute result as before last change. * sysdeps/libm-ieee754/w_gammaf.c: Likewise. * sysdeps/libm-ieee754/w_gammal.c: Likewise. 1997-06-16 23:37 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/s_remquo.c: Fix off-by-one when computing quotient. * sysdeps/libm-ieee754/s_remquof.c: Likewise. * sysdeps/libm-ieee754/s_remquol.c: Likewise. * sysdeps/m68k/fpu/s_remquo.c: Remove FIXME and special case for quotient. * sysdeps/libm-ieee754/w_gamma.c: Add missing call to exp function. Don't use global signgam. * sysdeps/libm-ieee754/w_gammaf.c: Likewise. * sysdeps/libm-ieee754/w_gammal.c: Likewise. * math/Makefile (libm-calls): Remove w_gamma_r. * sysdeps/libm-ieee754/w_gamma_r.c: Remove file. * sysdeps/libm-ieee754/w_gammaf_r.c: Remove file. * sysdeps/libm-ieee754/w_gammal_r.c: Remove file. * math/libm-test.c (atanh_test): Declare x only if needed. (signbit_test): Fix typo. (gamma_test): Check whether function is implemented. Add epsilons. (lgamma_test): Likewise. (fmod_test): Add epsilons. (exp2_test): Use right function for existence test. 1997-06-07 09:20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/powerpc/Dist: Add fenv_const.c. * sysdeps/unix/sysv/linux/Dist: Add net/if_slip.h. * sysdeps/unix/sysv/linux/powerpc/Dist: Add init-first.h and syscall.h. * sysdeps/unix/sysv/linux/sparc/Dist: Add init-first.h. * string/Makefile (distribute): Add tst-svc.expect. * nis/Makefile (distribute): Add nis_intern.h and Banner. * elf/Makefile (distribute): Add dl-hash.h. * Rules (subdir_echo-distinfo): Add headers from $(distribute). * login/Makefile (others): Add utmpdump. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add net/if_slip.h. * manual/Makefile (dir-add.texi): Also look in indirectly included files. 1997-06-16 23:15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/configure.in: Remove commands to generate stdio_lim.h. * sysdeps/unix/sysv/linux/mk-stdiolim.c: Remove. * sysdeps/unix/sysv/linux/Makefile: Add rules to generate stdio_lim.h here. (common-generated): Add generated files. (inhibit-stdio_lim): Define. * sysdeps/posix/Makefile [$(inhibit-stdio_lim)=yes]: Disable rules to generate stdio_lim.h. * sysdeps/unix/sysv/linux/Makefile: Suppress inclusion of dependecy files if no_deps is set. ($(objpfx)syscall-%.d): Add header file as target to dependency generation. 1997-06-14 19:19 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/arm/Dist: New file. 1997-06-14 17:59 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * extra-lib.mk (others): Depend on versioned shared library, not the unversioned one. * Makerules (build-shlib): Don't make the version link here. ($(common-objpfx)libc.so$(libc.so-version)): New rule for libc version link. 1997-06-16 03:07 Ulrich Drepper <drepper@cygnus.com> * sysdeps/libm-ieee754/k_standard.c: Undo change of Tue Aug 6 01:13:56 1996. * argp/argp-help.c (argp_args_usage): Supply correct argp to filter_doc. * argp/argp-help.c (hol_add_cluster): Initialize CL->depth. * argp/argp-help.c (_help): Supply STATE to argp_args_usage. * argp/argp.h (ARGP_KEY_HELP_ARGS_DOC): New macro. * argp/argp-fmtstream.c: Add casts to prevent warnings. * argp/argp.h (OPTION_NO_USAGE): New macro. * argp/argp-help.c (usage_long_opt, usage_argful_short_opt, * argp/argp-fmtstream.c (__argp_fmtstream_update): Account for case * argp/argp-help.c <stddef.h>: New include. * argp/argp.h (argp_state_help, __argp_state_help, argp_usage, * argp/argp.h (argp_program_bug_address): Make const. * argp/argp-parse.c (argp_default_parser): Set STATE->name for OPT_PROGNAME. * argp/argp-help.c (__argp_error, __argp_failure, __argp_state_help): * argp/argp-parse.c (parser_init): Set PARSER->state.flags.
646 lines
16 KiB
C
646 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;
|
|
|
|
/* The request size varies, so don't check it. */
|
|
request = (setutent_request *)connection->read_base;
|
|
|
|
/* 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,
|
|
request->header.size - sizeof (setutent_request)))
|
|
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)
|
|
{
|
|
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;
|
|
|
|
/* The request size varies, so don't check it. */
|
|
request = (updwtmp_request *)connection->read_base;
|
|
|
|
/* 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,
|
|
request->header.size - sizeof (updwtmp_request)))
|
|
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;
|
|
}
|