mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-18 02:50:09 +00:00
7ba4fcfcf2
1998-06-01 Gordon Matzigkeit <gord@profitpress.com> * hurd/Makefile (routines): Add cthreads. 1998-05-31 Mark Kettenis <kettenis@phys.uva.nl> * login/login.c (login): Let pututline take care of finding the positin to insert the UTMP entry. This corrects a bug where ssh was not reusing UTMP entries marked as DEAD_PROCESS. Reported by Herbert Xu <herbert@gondor.apana.org.au>. 1998-05-31 Mark Kettenis <kettenis@phys.uva.nl> * login/Makefile (tests): New variable, add tst-utmp and tst-utmpx. * login/tst-utmp.c: New file. * login/tst-utmpx.c: New file. 1998-06-01 Gordon Matzigkeit <gord@profitpress.com> * sysdeps/mach/hurd/errlist.c (sys_nerr, _sys_nerr): Make weak aliases for _hurd_nerr, for programs that don't use sys_errlist, but need sys_err. 1998-05-31 Mark Kettenis <kettenis@phys.uva.nl> * sysdeps/generic/updwtmpx.c: Rename function to updwtmpx. * libc.map: Add updwtmpx and utmpxname to GLIBC_2.1. 1998-05-31 Mark Kettenis <kettenis@phys.uva.nl> * sysdeps/mach/hurd/read.c: Rename function to __libc_read and make __read a weak alias. Use ANSI-style function definition. * sysdeps/mach/hurd/write.c: Likewise. 1998-05-31 Mark Kettenis <kettenis@phys.uva.nl> * sysdeps/mach/hurd/err_hurd.sub: Use _hurd_errlist instead of _sys_errlist. 1998-05-30 Mark Kettenis <kettenis@phys.uva.nl> * sysdeps/mach/hurd/Makefile ($(objpfx)librtld.os): Renamed from librtld.so. 1998-06-02 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libc.map: Remove _IO_getline_info which was erroneously introduced in section GLIBC_2.0. Noticed by Horst von Brand <vonbrand@sleipnir.valparaiso.cl>. 1998-06-01 Gordon Matzigkeit <gord@profitpress.com> * sysdeps/generic/socket.c (__socket): Renamed from socket, and created a weak alias. * sysdeps/mach/hurd/socket.c (__socket): Likewise. 1998-05-31 Gordon Matzigkeit <gord@profitpress.com> * sysdeps/mach/hurd/ftruncate.c (__ftruncate): Rename from old ftruncate function, and create a weak alias to ftruncate. 1998-06-01 Gordon Matzigkeit <gord@profitpress.com> * grp/fgetgrent_r.c: Use &errno instead of __errno_location (). * inet/getnetgrent_r.c: Likewise. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent_r.c: Likewise. * pwd/fgetpwent_r.c: Likewise. * shadow/sgetspent_r.c: Likewise. * shadow/fgetspent_r.c: Likewise. * sunrpc/publickey.c: Likewise. 1998-06-01 Gordon Matzigkeit <gord@profitpress.com> * hurd/libhurduser.map: New file. * mach/libmachuser.map: Likewise. * libc.map: Add Hurd-specific functions to version 2.1. Add __flshfp and __fillbf. 1998-05-30 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/signal.texi (Basic Signal Handling): Fix typo. * manual/errno.texi (Error Codes): Likewise. 1998-06-02 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/netipx/ipx.h: Include <bits/sockaddr.h> instead of <sys/socket.h>. Patch by NIIBE Yutaka <gniibe@mri.co.jp> * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c (DL_FIND_ARG_COMPONENTS): Finally make it working. Patch by Mark Hatle <fray@kernel.crashing.org>. 1998-03-22 Paul Eggert <eggert@twinsun.com> * posix/regex.c: Include <wchar.h> before <wctype.h>, to work around a Solaris 2.6 bug.
381 lines
7.4 KiB
C
381 lines
7.4 KiB
C
/* Tests for UTMP functions.
|
|
Copyright (C) 1998 Free Software Foundation, Inc.
|
|
Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1998.
|
|
|
|
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 <error.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <time.h>
|
|
|
|
#ifdef UTMPX
|
|
# include <utmpx.h>
|
|
# define utmp utmpx
|
|
# define utmpname utmpxname
|
|
# define setutent setutxent
|
|
# define getutent getutxent
|
|
# define endutent endutxent
|
|
# define getutline getutxline
|
|
# define getutid getutxid
|
|
# define pututline pututxline
|
|
#else
|
|
# include <utmp.h>
|
|
#endif
|
|
|
|
|
|
/* Prototype for our test function. */
|
|
static int do_test (int argc, char *argv[]);
|
|
|
|
/* We have a preparation function. */
|
|
static void do_prepare (int argc, char *argv[]);
|
|
#define PREPARE do_prepare
|
|
|
|
/* This defines the `main' function and some more. */
|
|
#include <test-skeleton.c>
|
|
|
|
|
|
/* These are for the temporary file we generate. */
|
|
char *name;
|
|
int fd;
|
|
|
|
static void
|
|
do_prepare (int argc, char *argv[])
|
|
{
|
|
size_t name_len;
|
|
|
|
name_len = strlen (test_dir);
|
|
name = malloc (name_len + sizeof ("/utmpXXXXXX"));
|
|
mempcpy (mempcpy (name, test_dir, name_len),
|
|
"/utmpXXXXXX", sizeof ("/utmpXXXXXX"));
|
|
add_temp_file (name);
|
|
|
|
/* Open our test file. */
|
|
fd = mkstemp (name);
|
|
if (fd == -1)
|
|
error (EXIT_FAILURE, errno, "cannot open test file `%s'", name);
|
|
}
|
|
|
|
|
|
struct utmp entry[] =
|
|
{
|
|
{ ut_type: BOOT_TIME, ut_pid: 1, ut_tv: { tv_sec: 1000 } },
|
|
{ ut_type: RUN_LVL, ut_pid: 1, ut_tv: { tv_sec: 2000 } },
|
|
{ ut_type: INIT_PROCESS, ut_pid: 5, ut_id: "si", ut_tv: { tv_sec: 3000 } },
|
|
{ ut_type: LOGIN_PROCESS, ut_pid: 23, ut_line: "tty1", ut_id: "1",
|
|
ut_user: "LOGIN", ut_session: 23, ut_tv: { tv_sec: 4000 } },
|
|
{ ut_type: USER_PROCESS, ut_pid: 24, ut_line: "tty2", ut_id: "2",
|
|
ut_user: "albert", ut_session: 24, ut_tv: { tv_sec: 8000 } },
|
|
{ ut_type: USER_PROCESS, ut_pid: 196, ut_line: "ttyp0", ut_id: "p0",
|
|
ut_user: "niels", ut_session: 196, ut_tv: { tv_sec: 10000 } },
|
|
{ ut_type: DEAD_PROCESS, ut_line: "ttyp1", ut_id: "p1",
|
|
ut_tv: { tv_sec: 16000 } },
|
|
{ ut_type: EMPTY },
|
|
{ ut_type: EMPTY }
|
|
};
|
|
int num_entries = sizeof entry / sizeof (struct utmp);
|
|
|
|
time_t entry_time = 20000;
|
|
pid_t entry_pid = 234;
|
|
|
|
static int
|
|
do_init (void)
|
|
{
|
|
int n;
|
|
|
|
setutent ();
|
|
|
|
for (n = 0; n < num_entries; n++)
|
|
{
|
|
if (pututline (&entry[n]) == NULL)
|
|
{
|
|
error (0, errno, "cannot write UTMP entry");
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
endutent ();
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
do_check (void)
|
|
{
|
|
struct utmp *ut;
|
|
int n;
|
|
|
|
setutent ();
|
|
|
|
n = 0;
|
|
while ((ut = getutent ()))
|
|
{
|
|
if (n < num_entries &&
|
|
memcmp (ut, &entry[n], sizeof (struct utmp)))
|
|
{
|
|
error (0, 0, "UTMP entry does not match");
|
|
return 1;
|
|
}
|
|
|
|
n++;
|
|
}
|
|
|
|
if (n != num_entries)
|
|
{
|
|
error (0, 0, "number of UTMP entries is incorrect");
|
|
return 1;
|
|
}
|
|
|
|
endutent ();
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
simulate_login (const char *line, const char *user)
|
|
{
|
|
int n;
|
|
|
|
for (n = 0; n < num_entries; n++)
|
|
{
|
|
if (strcmp (line, entry[n].ut_line) == 0 ||
|
|
entry[n].ut_type == DEAD_PROCESS)
|
|
{
|
|
if (entry[n].ut_pid == DEAD_PROCESS)
|
|
entry[n].ut_pid = (entry_pid += 27);
|
|
entry[n].ut_type = USER_PROCESS;
|
|
strcpy (entry[n].ut_user, user);
|
|
entry[n].ut_tv.tv_sec = (entry_time += 1000);
|
|
|
|
setutent ();
|
|
|
|
if (pututline (&entry[n]) == NULL)
|
|
{
|
|
error (0, errno, "cannot write UTMP entry");
|
|
return 1;
|
|
}
|
|
|
|
endutent ();
|
|
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
error (0, 0, "no entries available");
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
simulate_logout (const char *line)
|
|
{
|
|
int n;
|
|
|
|
for (n = 0; n < num_entries; n++)
|
|
{
|
|
if (strcmp (line, entry[n].ut_line) == 0)
|
|
{
|
|
entry[n].ut_type = DEAD_PROCESS;
|
|
entry[n].ut_user[0] = '\0';
|
|
entry[n].ut_tv.tv_sec = (entry_time += 1000);
|
|
|
|
setutent ();
|
|
|
|
if (pututline (&entry[n]) == NULL)
|
|
{
|
|
error (0, errno, "cannot write UTMP entry");
|
|
return 1;
|
|
}
|
|
|
|
endutent ();
|
|
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
error (0, 0, "no entry found for `%s'", line);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
check_login (const char *line)
|
|
{
|
|
struct utmp *up;
|
|
struct utmp ut;
|
|
int n;
|
|
|
|
setutent ();
|
|
|
|
strcpy (ut.ut_line, line);
|
|
up = getutline (&ut);
|
|
if (up == NULL)
|
|
{
|
|
error (0, errno, "cannot get entry for line `%s'", line);
|
|
return 1;
|
|
}
|
|
|
|
endutent ();
|
|
|
|
for (n = 0; n < num_entries; n++)
|
|
{
|
|
if (strcmp (line, entry[n].ut_line) == 0)
|
|
{
|
|
if (memcmp (up, &entry[n], sizeof (struct utmp)))
|
|
{
|
|
error (0, 0, "UTMP entry does not match");
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
error (0, 0, "bogus entry for line `%s'", line);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
check_logout (const char *line)
|
|
{
|
|
struct utmp ut;
|
|
|
|
setutent ();
|
|
|
|
strcpy (ut.ut_line, line);
|
|
if (getutline (&ut) != NULL)
|
|
{
|
|
error (0, 0, "bogus login entry for `%s'", line);
|
|
return 1;
|
|
}
|
|
|
|
endutent ();
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
check_id (const char *id)
|
|
{
|
|
struct utmp *up;
|
|
struct utmp ut;
|
|
int n;
|
|
|
|
setutent ();
|
|
|
|
ut.ut_type = USER_PROCESS;
|
|
strcpy (ut.ut_id, id);
|
|
up = getutid (&ut);
|
|
if (up == NULL)
|
|
{
|
|
error (0, errno, "cannot get entry for ID `%s'", id);
|
|
return 1;
|
|
}
|
|
|
|
endutent ();
|
|
|
|
for (n = 0; n < num_entries; n++)
|
|
{
|
|
if (strcmp (id, entry[n].ut_id) == 0)
|
|
{
|
|
if (memcmp (up, &entry[n], sizeof (struct utmp)))
|
|
{
|
|
error (0, 0, "UTMP entry does not match");
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
error (0, 0, "bogus entry for ID `%s'", id);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
check_type (int type)
|
|
{
|
|
struct utmp *up;
|
|
struct utmp ut;
|
|
int n;
|
|
|
|
setutent ();
|
|
|
|
ut.ut_type = type;
|
|
up = getutid (&ut);
|
|
if (up == NULL)
|
|
{
|
|
error (0, errno, "cannot get entry for type `%d'", type);
|
|
return 1;
|
|
}
|
|
|
|
endutent ();
|
|
|
|
for (n = 0; n < num_entries; n++)
|
|
{
|
|
if (type == entry[n].ut_type)
|
|
{
|
|
if (memcmp (up, &entry[n], sizeof (struct utmp)))
|
|
{
|
|
error (0, 0, "UTMP entry does not match");
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
error (0, 0, "bogus entry for type `%d'", type);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
do_test (int argc, char *argv[])
|
|
{
|
|
int result = 0;
|
|
|
|
utmpname (name);
|
|
|
|
result |= do_init ();
|
|
result |= do_check ();
|
|
|
|
result |= simulate_login ("tty1", "erwin");
|
|
result |= do_check ();
|
|
|
|
result |= simulate_login ("ttyp1", "paul");
|
|
result |= do_check ();
|
|
|
|
result |= simulate_logout ("tty2");
|
|
result |= do_check ();
|
|
|
|
result |= simulate_logout ("ttyp0");
|
|
result |= do_check ();
|
|
|
|
result |= simulate_login ("ttyp2", "richard");
|
|
result |= do_check ();
|
|
|
|
result |= check_login ("tty1");
|
|
result |= check_logout ("ttyp0");
|
|
result |= check_id ("p1");
|
|
result |= check_id ("2");
|
|
result |= check_id ("si");
|
|
result |= check_type (BOOT_TIME);
|
|
result |= check_type (RUN_LVL);
|
|
|
|
return result;
|
|
}
|