mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-18 19:10:06 +00:00
8f2ece695d
1997-08-02 21:27 Ulrich Drepper <drepper@cygnus.com> * inet/Makefile (headers): Rename netinet/inbits.h to bits/in.h. * inet/netinet/in.h: Include bits/in.h instead of netinet/inbits.h. * sysdeps/generic/netinet/inbits.h: Move to... * sysdeps/generic/bits/in.h: ... here. * sysdeps/unix/sysv/linux/bits/inbits.h: Move to ... * sysdeps/unix/sysv/linux/bits/in.h: ... here. * nis/Makefile (headers): Add bits/nislib.h. * nis/rpcsvc/nislib.h: Moved to .... * nis/bits/nislib.h: ... here. * nis/nss_compat/compat-grp.c: Don't include <rpcsvc/nislib.h>. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-netgrp.c: Likewise. * nis/nss_nisplus/nisplus-ntework.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/rpcsvc/nis.x: Include bits/nislib.h, not rpcsvc/nislib.h. * nis/rpcsvc/nis.h: Likewise. * inet/getnameinfo.c (nrl_domainname): Change return type to const char *. (getnameinfo): Change type of local variable c to const char *. * inet/inet_ntoa.c: Rewrite to use __libc_once for initialization. * stdlib/fmtmsg.c: Likewise. * intl/bindtextdom.c: Update from latest gettext. * intl/dcgettext.c: Likewise. * intl/finddomain.c: Likewise. * intl/l10nflist.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. * login/getutid_r.c: Remove parameter to setutent call. * login/getutline_r.c: Likewise. * posix/wordexp.c: Complete rewrite. Not fully implemented yet, though. Patch by Tim Waugh <tim@cyberelk.demon.co.uk>. * stdio-common/printf_fp.c: Remove relative include paths. * stdio-common/printf_fphex.c: Likewise. * sysdeps/generic/crypt.h: Cleanup. Don't define non standard elements unless __USE_GNU. * sysdeps/generic/vlimit.c: Pretty print. * sysdeps/generic/vtimes.c: Likewise. * sysdeps/i386/elf/bsd-_setjmp.S: New file. Empty dummy file. * sysdeps/i386/elf/bsd-setjmp.S: New file. Empty dummy file. * sysdeps/i386/elf/setjmp.S: New file. Define __setjmp and also weak definitions of setjmp and _setjmp. * sysdeps/i386/fpu/bits/mathinline.h: More patches by John Bowman. * sysdeps/stub/if_index.h: Set errno in all functions and add stub warnings. * sysdeps/stub/libc-lock.h: Add __libc_once. 1997-08-02 01:57 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/ptrace.c: Don't set errno in error case since the __syscall_ptrace call already did this. Reported by Philip Gladstone <philip@talon.raptor.com>. 1997-07-29 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/sys/fsuid.h: Change include <gnu/types.h> to <sys/types.h>. 1997-08-01 23:18 Ulrich Drepper <drepper@cygnus.com> * csu/defs.awk: Fix regexp for end and align. Patch by Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>. * locale/programs/localedef.c (print_escaped): New function. (show_info): Use print_escaped if strings can control unprintable characters. Patch by Jochen Hein <jochen.hein@delphi.central.de>. 1997-08-01 18:45 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nss_nisplus/nisplus-alias.c: Fix NULL pointer problems * nis/nss_nisplus/nisplus-grp.c: Likewise. 1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-profile.c (_dl_start_profile): Use _dl_sysdep_error instead of fprintf. 1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/socket.texi (Host Address Functions): Fix arguments of @deftypefun. 1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-runtime.c: Avoid warning about profile_fixup being unused. * sysdeps/m68k/dl-machine.h: Add support for shared library profiling. 1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * md5-crypt/Makefile (extra-objs): Add onlymd5-crypt.o for dependencies. 1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Make-dist (subdirs): Distribute both aout and elf. 1997-07-31 23:04 Mark Kettenis <kettenis@phys.uva.nl> * login/utmp-private.h: Remove reset argument from backend setutent. * login/getutent_r.c (__setutent): Allways call the setutent function in the daemon backend. (setutent_unknown): Function removed. (getutent_unknown, pututline_unknown): Call __setutent instead of setutent_unknown. * login/utmp_file.c (setutent_file): Removed reset argument. All callers changed. * login/utmp_daemon.c (setutent_daemon): Removed reset argument. All callers changed. Try to open connection even if a previous connection failed, but first check if the sockets exist in the filesystem. * login/utmp_daemon.c (pututline_daemon): Try to open connection before reporting failure. * login/programs/database.c (open_database): Create compatibility file if it does not already exist. Supply mode argument in open calls to guarantee that created files have the proper protection. * login/programs/utmpd.c (main): Remove files created by a previous `bind' before creating sockets. Suggested by a sun <asum@zoology.washington.edu>. 1997-07-29 Andreas Jaeger <aj@arthur.rhein-neckar.de> * math/libm-test.c: Remove unneeded function check_int_exec. * BUGS: Correct typos. * gmon/gmon.c: Add alias for monstartup, declare _strerror_internal. 1997-07-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/socket.texi (Host Address Functions): Reformat inet_ntop entry to confirm with expected behaviour of some scripts. * libc.map: Add functions/variables in global namespace, remove wildcards. 1997-07-29 Andreas Jaeger <aj@arthur.rhein-neckar.de> * resolv/libresolv.map: Add variables and routines used by named, nslookup and other bind utils. * libc.map: Likewise. 1997-07-31 00:35 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/if_index.c: Rewrite to avoid using /proc filesystem. * inet/test_ifindex.c: New file. * inet/Makefile (tests): Add test_ifindex. 1997-08-01 04:25 Ulrich Drepper <drepper@cygnus.com> * nis/nss_nisplus/nisplus-parser.c: Fix another bug in the parser. Patch by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>. * manual/errno.texi: Fix typo. Reported by Erik Talvola <etalvo@sapient.com>. (write_hist): Remove dependency on 32 bit int.
474 lines
11 KiB
C
474 lines
11 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 <errno.h>
|
|
#include <limits.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/un.h>
|
|
#include <unistd.h>
|
|
#include <utmp.h>
|
|
|
|
#include "utmp-private.h"
|
|
#include "programs/utmpd.h"
|
|
|
|
|
|
/* Descriptor for the socket. */
|
|
static int daemon_sock = INT_MIN;
|
|
|
|
|
|
/* Functions defined here. */
|
|
static int setutent_daemon (void);
|
|
static int getutent_r_daemon (struct utmp *buffer, struct utmp **result);
|
|
static int getutid_r_daemon (const struct utmp *line, struct utmp *buffer,
|
|
struct utmp **result);
|
|
static int getutline_r_daemon (const struct utmp *id, struct utmp *buffer,
|
|
struct utmp **result);
|
|
static struct utmp *pututline_daemon (const struct utmp *utmp);
|
|
static void endutent_daemon (void);
|
|
static int updwtmp_daemon (const char *file, const struct utmp *utmp);
|
|
|
|
/* Jump table for daemon functions. */
|
|
struct utfuncs __libc_utmp_daemon_functions =
|
|
{
|
|
setutent_daemon,
|
|
getutent_r_daemon,
|
|
getutid_r_daemon,
|
|
getutline_r_daemon,
|
|
pututline_daemon,
|
|
endutent_daemon,
|
|
updwtmp_daemon
|
|
};
|
|
|
|
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_updwtmp (int sock, const char *file,
|
|
const struct utmp *utmp);
|
|
|
|
static int open_socket (const char *name);
|
|
static int send_request (int sock, const request_header *request,
|
|
reply_header *reply);
|
|
|
|
|
|
static int
|
|
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);
|
|
if (daemon_sock < 0)
|
|
{
|
|
/* Hhm, read-write access did not work. Try read-only. */
|
|
daemon_sock = open_socket (_PATH_UTMPD_RO);
|
|
if (daemon_sock < 0)
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
/* Send request to the daemon. */
|
|
if (do_setutent (daemon_sock) < 0)
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
|
|
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;
|
|
}
|
|
|
|
/* Send request to the daemon. */
|
|
if (do_getutent (daemon_sock, buffer) < 0)
|
|
{
|
|
*result = NULL;
|
|
return -1;;
|
|
}
|
|
|
|
*result = buffer;
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
getutline_r_daemon (const struct utmp *line, struct utmp *buffer,
|
|
struct utmp **result)
|
|
{
|
|
if (daemon_sock < 0)
|
|
{
|
|
*result = NULL;
|
|
return -1;
|
|
}
|
|
|
|
/* Send request to the daemon. */
|
|
if (do_getutline (daemon_sock, line, buffer) < 0)
|
|
{
|
|
*result = NULL;
|
|
return -1;;
|
|
}
|
|
|
|
*result = buffer;
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
getutid_r_daemon (const struct utmp *id, struct utmp *buffer,
|
|
struct utmp **result)
|
|
{
|
|
if (daemon_sock < 0)
|
|
{
|
|
*result = NULL;
|
|
return -1;
|
|
}
|
|
|
|
/* Send request to the daemon. */
|
|
if (do_getutid (daemon_sock, id, buffer) < 0)
|
|
{
|
|
*result = NULL;
|
|
return -1;
|
|
}
|
|
|
|
*result = buffer;
|
|
return 0;
|
|
}
|
|
|
|
|
|
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;
|
|
|
|
/* Send request to the daemon. */
|
|
if (do_pututline (daemon_sock, utmp) < 0)
|
|
return NULL;
|
|
|
|
return (struct utmp *)utmp;
|
|
}
|
|
|
|
|
|
static int
|
|
updwtmp_daemon (const char *file, const struct utmp *utmp)
|
|
{
|
|
int sock;
|
|
|
|
/* Only try to open for both reading and writing. */
|
|
sock = open_socket (_PATH_UTMPD_RW);
|
|
if (sock < 0)
|
|
return -1;
|
|
|
|
/* Send request to the daemon. */
|
|
if (do_updwtmp (sock, file, utmp) < 0)
|
|
{
|
|
close (sock);
|
|
return -1;
|
|
}
|
|
|
|
close (sock);
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
do_setutent (int sock)
|
|
{
|
|
setutent_request *request;
|
|
setutent_reply reply;
|
|
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;
|
|
strcpy (request->file, __libc_utmp_file_name);
|
|
|
|
reply.header.version = UTMPD_VERSION;
|
|
reply.header.size = sizeof (setutent_reply);
|
|
reply.header.type = UTMPD_REQ_SETUTENT;
|
|
|
|
if (send_request (sock, &request->header, &reply.header) < 0)
|
|
{
|
|
free (request);
|
|
return -1;
|
|
}
|
|
|
|
if (reply.result < 0)
|
|
__set_errno (reply.errnum);
|
|
|
|
free (request);
|
|
return reply.result;
|
|
}
|
|
|
|
static int
|
|
do_getutent (int sock, struct utmp *buffer)
|
|
{
|
|
getutent_request request;
|
|
getutent_reply reply;
|
|
|
|
request.header.version = UTMPD_VERSION;
|
|
request.header.size = sizeof (getutent_request);
|
|
request.header.type = UTMPD_REQ_GETUTENT;
|
|
|
|
reply.header.version = UTMPD_VERSION;
|
|
reply.header.size = sizeof (getutent_reply);
|
|
reply.header.type = UTMPD_REQ_GETUTENT;
|
|
|
|
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_endutent (int sock)
|
|
{
|
|
endutent_request request;
|
|
endutent_reply reply;
|
|
|
|
request.header.version = UTMPD_VERSION;
|
|
request.header.size = sizeof (endutent_request);
|
|
request.header.type = UTMPD_REQ_ENDUTENT;
|
|
|
|
reply.header.version = UTMPD_VERSION;
|
|
reply.header.size = sizeof (endutent_reply);
|
|
reply.header.type = UTMPD_REQ_ENDUTENT;
|
|
|
|
if (send_request (sock, &request.header, &reply.header) < 0)
|
|
return -1;
|
|
|
|
if (reply.result < 0)
|
|
__set_errno (reply.errnum);
|
|
|
|
return reply.result;
|
|
}
|
|
|
|
static int
|
|
do_getutline (int sock, const struct utmp *line, struct utmp *buffer)
|
|
{
|
|
getutline_request request;
|
|
getutline_reply reply;
|
|
|
|
request.header.version = UTMPD_VERSION;
|
|
request.header.size = sizeof (getutline_request);
|
|
request.header.type = UTMPD_REQ_GETUTLINE;
|
|
memcpy (&request.line, line, sizeof (struct utmp));
|
|
|
|
reply.header.version = UTMPD_VERSION;
|
|
reply.header.size = sizeof (getutline_reply);
|
|
reply.header.type = UTMPD_REQ_GETUTLINE;
|
|
|
|
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_getutid (int sock, const struct utmp *id, struct utmp *buffer)
|
|
{
|
|
getutid_request request;
|
|
getutid_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));
|
|
|
|
reply.header.version = UTMPD_VERSION;
|
|
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;
|
|
}
|
|
|
|
static int
|
|
do_pututline (int sock, const struct utmp *utmp)
|
|
{
|
|
pututline_request request;
|
|
pututline_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));
|
|
|
|
reply.header.version = UTMPD_VERSION;
|
|
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);
|
|
|
|
return reply.result;
|
|
}
|
|
|
|
static int
|
|
do_updwtmp (int sock, const char *file, const struct utmp *utmp)
|
|
{
|
|
updwtmp_request *request;
|
|
updwtmp_reply reply;
|
|
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;
|
|
memcpy (&request->utmp, utmp, sizeof (struct utmp));
|
|
strcpy (request->file, file);
|
|
|
|
reply.header.version = UTMPD_VERSION;
|
|
reply.header.size = sizeof (updwtmp_reply);
|
|
reply.header.type = UTMPD_REQ_UPDWTMP;
|
|
|
|
if (send_request (sock, &request->header, &reply.header) < 0)
|
|
{
|
|
free (request);
|
|
return -1;
|
|
}
|
|
|
|
if (reply.result < 0)
|
|
__set_errno (reply.errnum);
|
|
|
|
free (request);
|
|
return reply.result;
|
|
}
|
|
|
|
|
|
/* Create a socket connected to NAME. */
|
|
static int
|
|
open_socket (const char *name)
|
|
{
|
|
struct sockaddr_un addr;
|
|
int sock;
|
|
|
|
sock = socket (PF_UNIX, SOCK_STREAM, 0);
|
|
if (sock < 0)
|
|
return -1;
|
|
|
|
addr.sun_family = AF_UNIX;
|
|
strcpy (addr.sun_path, name);
|
|
if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0)
|
|
{
|
|
close (sock);
|
|
return -1;
|
|
}
|
|
|
|
return sock;
|
|
}
|
|
|
|
/* Send REQUEST to SOCK, and wait for reply. Returns 0 if successful,
|
|
storing the reply in REPLY, and -1 if not. */
|
|
static int
|
|
send_request (int sock, const request_header *request,
|
|
reply_header *reply)
|
|
{
|
|
reply_header header;
|
|
ssize_t nbytes;
|
|
|
|
nbytes = write (sock, request, request->size);
|
|
if (nbytes != (ssize_t) request->size)
|
|
return -1;
|
|
|
|
nbytes = read (sock, &header, sizeof (reply_header));
|
|
if (nbytes != sizeof (reply_header))
|
|
return -1;
|
|
|
|
if (reply->version != header.version
|
|
|| reply->size != header.size
|
|
|| reply->type != header.type)
|
|
return -1;
|
|
|
|
nbytes = read (sock, reply + 1, reply->size - sizeof (reply_header));
|
|
if (nbytes != (ssize_t) (reply->size - sizeof (reply_header)))
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|