Update.cvs/libc-ud-970810

1997-08-10 18:48  Ulrich Drepper  <drepper@cygnus.com>

	* Makeconfig: Define build-programs to no if not set and $(config-os)
	is none.
	* Makerules (+depfiles): Don't add $(others) if not build-programs.
	* Rules (others): Don't depend on $(install-bin), $(install-rootbin)
	and $(install-sbin) if not build-programs.
	* Makefile (subdirs): Remove login.
	* sysdeps/mach/hurd/Subdirs: Add login.
	* sysdeps/unix/Subdirs: Add login.

	* sysdeps/generic/sys/mman.h: Test feature macros before defining
	non-POSIX things.  Add MAP_FAILED.
	* sysdeps/unix/bsd/osf/sys/mman.h: Likewise.
	* sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise.
	* sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise.
	* sysdeps/unix/sysv/irix4/sys/mman.h: Likewise.
	* sysdeps/unix/sysv/linux/sys/mman.h: Rewrite to not use kernel header
	but bits/mman.h.  Test feature macros before definitions non-POSIX
	functions.
	* sysdeps/unix/sysv/linux/alpha/bits/mman.h: New file.
	* sysdeps/unix/sysv/linux/i386/bits/mman.h: New file.
	* sysdeps/unix/sysv/linux/m68k/bits/mman.h: New file.
	* sysdeps/unix/sysv/linux/mips/bits/mman.h: New file.
	* sysdeps/unix/sysv/linux/powerpc/bits/mman.h: New file.
	* sysdeps/unix/sysv/linux/sparc/bits/mman.h: New file.
	* sysdeps/unix/sysv/linux/sparc64/bits/mman.h: New file.
	* sysdeps/unix/sysv/linux/alpha/Dist: Add bits/mman.h.
	* sysdeps/unix/sysv/linux/i386/Dist: Likewise.
	* sysdeps/unix/sysv/linux/m68k/Dist: Likewise.
	* sysdeps/unix/sysv/linux/mips/Dist: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/Dist: Likewise.
	* sysdeps/unix/sysv/linux/sparc/Dist: Likewise.
	* sysdeps/unix/sysv/linux/sparc64/Dist: New file.  Likewise.

	* catgets/open_catalog.c (__open_catalog): Compare result of mmap
	with MAP_FAILED and not -1.
	* elf/dl-load.c (_dl_map_object_from_fd): Likewise.
	* elf/dl-minimal.c (malloc): Likewise.
	* elf/dl-misc.c (_dl_sysdep_read_whole_file): Likewise.
	* locale/loadlocale.c (_nl_load_locale): Likewise.
	* locale/programs/localedef.c: Likewise.
	* malloc/malloc.c (mmap_chunk): Likewise.
	(new_heap): Likewise.
	* string/stratcliff.c: Likewise.
	* string/tester.c: Add tests for stpcpy.

	* gmon/gmon.c (__monstartup): Use calloc instead of malloc+memset.

	* gmon/sys/gmon.h: Add prototype for write_profiling.

	* elf/dl-profile.c: Add decsriptions and implement reading of
	existing data in profiling file.
	* gmon/sys/gmon_out.h (GMON_SHOBJ_VERSION): New macro for shared
	lib profiling data.

	* sysdeps/stub/bits/libc-lock.h (__libc_once_define): Add new first
	parameter for class.

	* inet/inet_ntoa.c: Make once control variable static.
	Correctly handle case where key cannot be retrieved.
	* inet/Makefile (tests): Add tst-ntoa.
	* inet/tst-ntoa.c: New file.

	* manual/time.texi: Document localtime_r, gmtime_r, asctime_r, and
	ctime_r.
	Mention that tzname values must not be changed.

	* manual/users.texi: Document UTMP/WTMP handling functions.
	Mainly written by Mark Kettenis.

	* math/libm-test.c (cbrt_test): Add test for number with aboslute
	value < 1.0.

	* nss/nss_files/files-XXX.c (internal_setent): If opening of file
	failed with EGAIN return NSS_STATUS_TRYAGAIN.
	* nss/nss_files/files-alias.c (internal_setent): Likewise.

	* sysdeps/generic/bits/utmp.h: Pretty print.

	* sysdeps/i386/i586/strcpy.S: New file.  Much faster implementation.
	* sysdeps/i386/i586/stpcpy.S: New file.
	* sysdeps/i386/i686/Implies: Don't fall back on i586 versions since
	these are less efficient than i486/i386 versions.

	* sysdeps/libm-i387/e_rem_pio2.c: Add empty file to prevent the
	version from libm-ieee754 be compiled since the later is not needed.
	* sysdeps/libm-i387/e_rem_pio2f.c: Likewise.
	* sysdeps/libm-i387/e_rem_pio2l.c: Likewise.
	* sysdeps/libm-i387/k_rem_pio2.c: Likewise.
	* sysdeps/libm-i387/k_rem_pio2f.c: Likewise.
	* sysdeps/libm-i387/k_rem_pio2l.c: Likewise.
	* sysdeps/m68k/fpu/e_rem_pio2.c: Likewise.
	* sysdeps/m68k/fpu/e_rem_pio2f.c: Likewise.
	* sysdeps/m68k/fpu/e_rem_pio2l.c: Likewise.
	* sysdeps/m68k/fpu/k_rem_pio2.c: Likewise.
	* sysdeps/m68k/fpu/k_rem_pio2f.c: Likewise.
	* sysdeps/m68k/fpu/k_rem_pio2l.c: Likewise.

	* sysdeps/libm-i387/s_cbrt.S: Fix several bugs.
	* sysdeps/libm-i387/s_cbrtf.S: Likewise.
	* sysdeps/libm-i387/s_cbrtl.S: Likewise.

	* sysdeps/unix/sysv/linux/if_index.c (if_indextoname): Correct
	little bug.

	* sysdeps/unix/sysv/linux/bits/socket.h (struct msghdr): Make field
	msg_iovlen of type int.

	* time/tzfile.c: Change return type of __tzstring to char *.
	* time/tzset.c: Likewise.  Change definition of __tzstring.

	* time/tzset.c: Interpret no DST information in user provided time
	zone specification as it is meant: no DST.
	Patch by Paul Eggert <eggert@twinsun.com>.

1997-07-20 03:01  Geoff Keating  <geoffk@ozemail.com.au>

	* sysdeps/elf/dl-load.c (add_name_to_object): New procedure.
	(_dl_map_object_from_fd): Use add_name_to_object.
	(_dl_map_object): If an object's SONAME is used to resolve a
	dependency, add it to the list of the object's names.

	* inet/getnameinfo.c: Make `domain' non-const.

	* sysdeps/unix/sysv/linux/powerpc/kernel_termios.c: Clean up.

	* math/test-fenv.c (feenv_nomask_test): Don't execute if
	FE_NOMASK_ENV is not defined, or if fesetenv(FE_NOMASK_ENV)
	sets errno to ENOSYS.

	* sysdeps/powerpc/dl-machine.h: Print proper error message on
	unknown reloc type (rather than using assert).

	* sysdeps/unix/sysv/linux/powerpc/profil-counter.h: New file.
	* sysdeps/unix/sysv/linux/powerpc/profil.c: Deleted.

1997-07-16 12:47  Geoff Keating  <geoffk@ozemail.com.au>

	* sysdeps/powerpc/bits/fenv.h (feraiseexcept): New optimising macro.
	(feclearexcept): New optimising macro.
	(FE_NOMASK_ENV): Change to procedure so it can enable exceptions.
	(FE_ENABLED_ENV): Add.
	(FE_NONIEEE_ENV): Add.
	* sysdeps/powerpc/bits/fenv_const.c: Add __fe_enabled_env,
	__fe_nonieee_env; delete __fe_nomask_env.
	* sysdeps/powerpc/bits/fe_nomask.c: New file (stub warning until it
	gets implemented in the kernel).

	* sysdeps/powerpc/fraiseenv.c: Deal with chips that don't have
	FE_INVALID_SOFTWARE implemented. Use macros for bit names for clarity.
	* sysdeps/powerpc/fsetexcptflag.c: Likewise.

	* io/ftw.c: Don't compare holes in structures.
	* sysdeps/unix/sysv/linux/sys/sysmacros.h: Cast the result of the
	macros to `int', because otherwise it might be `long long' which
	the calling code is probably not expecting.

	* sysdeps/libm-ieee754/s_lround.c [NO_LONG_DOUBLE]: Fix a few bugs,
	document the existence of some more.

	* sysdeps/powerpc/s_llrint.c: New file.
	* sysdeps/powerpc/s_lrint.c: New file.
	* sysdeps/powerpc/s_llround.c: New file.
	* sysdeps/powerpc/s_lround.c: New file.

	* sysdeps/powerpc/s_sqrt.c: New file.
	* sysdeps/powerpc/s_sqrtf.c: New file.
	* sysdeps/powerpc/w_sqrt.s: New empty file.
	* sysdeps/powerpc/w_sqrtf.s: New empty file.
	* sysdeps/powerpc/t_sqrt.c: New file.
	* sysdeps/powerpc/test-arithf.c: New file.
	* sysdeps/powerpc/Makefile [subdir=math]: Add t_sqrt to support
	routines.  Add test-arithf to test programs.

	* sysdeps/powerpc/bits/mathdef.h: Add FP_ILOGB0, FP_ILOGBNAN.

	* sysdeps/powerpc/strcmp.s: Simplify drastically. Now much neater,
	and possibly faster (or possibly slower, depending on input).

1997-06-08 22:55  Geoff Keating  <geoffk@ozemail.com.au>

	* sysdeps/powerpc/fenvbits.h: Correct FE_DFL_ENV and FE_NOMASK_ENV
	macros.
	* sysdeps/powerpc/s_rint.c: New file.

1997-05-22 08:47  Geoff Keating  <geoffk@ozemail.com.au>

	* sysdeps/powerpc/Makefile [subdir=math]: Add q_* routines.
	* sysdeps/powerpc/Dist: Add quad_float.h.
	* sysdeps/powerpc/q_dtoq.c: New file.
	* sysdeps/powerpc/q_itoq.c: New file.
	* sysdeps/powerpc/q_lltoq.c: New file.
	* sysdeps/powerpc/q_neg.c: New file.
	* sysdeps/powerpc/q_qtoi.c: New file.
	* sysdeps/powerpc/q_qtoll.c: New file.
	* sysdeps/powerpc/q_qtos.c: New file.
	* sysdeps/powerpc/q_qtou.c: New file.
	* sysdeps/powerpc/q_qtoull.c: New file.
	* sysdeps/powerpc/q_stoq.c: New file.
	* sysdeps/powerpc/q_ulltoq.c: New file.
	* sysdeps/powerpc/q_utoq.c: New file.
	* sysdeps/powerpc/quad_float.h: New file.
	* sysdeps/powerpc/test-arith.c: New file.

	* sysdeps/powerpc/fpu_control.h: Fix _FPU_GETCW.
	* sysdeps/powerpc/fegetround.c: Use mcrfs to be faster and not
	require a stack frame.
	* sysdeps/powerpc/bits/fenv.h: Include inline macro for fegetround.

1997-05-18 05:55  Geoff Keating  <geoffk@ozemail.com.au>

	* sysdeps/powerpc/fenv_libc.h (fegetenv_register,
	fesetenv_register): Add 'volatile'.
	(set_fpscr_bit, reset_fpscr_bit): New macros, FPSCR_*
	constants to use with them.
	* sysdeps/powerpc/s_copysign.S: New file.
	* sysdeps/powerpc/s_copysignf.s: New file.
	* sysdeps/powerpc/s_fabs.S: New file.
	* sysdeps/powerpc/s_fabsf.s: New file.
	* sysdeps/powerpc/s_isnan.c: New file.
	* sysdeps/powerpc/s_isnanf.s: New file.
	* sysdeps/powerpc/s_rintf.c: New file.

	* sysdeps/powerpc/fenvbits.h: Make FE_INVALID the summary
	bit in the FPSCR, not the enable bit.
	* sysdeps/powerpc/fraiseexcpt.c: Consequent change to the above.
	* sysdeps/powerpc/fclrexcpt.c: Correct.
	* sysdeps/powerpc/fsetexcptflag.c: Correct.
	* sysdeps/powerpc/ftestexcpt.c: Is now much simpler.
	* sysdeps/powerpc/fgetexcptflg.c: Simplify.

	* sysdeps/powerpc/strlen.s: Schedule better, save 3 clocks :-).

	* sysdeps/powerpc/dl-machine.h (elf_machine_rela): Add comment
	explaining some reentrancy issues with lazy PLT entries.

1997-08-09 13:04  Mark Kettenis  <kettenis@phys.uva.nl>

	* login/logout.c (logout): utmpname returns -1 on error.

	* login/libutil.map: Remove updwtmp.

	* login/getutline.c: Rename getutline to __getutline and make
	getutline a weak alias.  Make getutxline a weak alias for
	__getutline.
	* login/getutid.c: Rename getutid to __getutid and make getutid a
	weak alias.  Make getutxid a weak alias for __getutid.
	* libc.map: Add getutxid, getutxline.

	* login/utmpname.c (__utmpname): Reset backend right after backend
	endutent call.
	* login/utmp_file.c: Reordered functions.  Remove unecessary
	header files.
	(getutent_r_file, pututline_file): Do not call setutent_file.  At this
	point the file is guaranteed to be open (assert!).
	(getutid_r_file, getutline_r_file): Remove check for validity of file
	descriptor.  At this point the file is guaranteed to be open.
	(getutent_r_file, internal_getut_r, getutline_r_file, pututline_file,
	updwtmp_file): Do not wait when unlocking file.
	* login/utmp_daemon.c: General cleanup and a bit of reordering.
	(getutent_r_daemon, pututline_daemon): Do not call setutent_daemon.
	At this point the socket is guaranteed to be open (assert!).
	(getutid_r_daemon, getutline_r_daemon): Do not check if daemon_sock is
	valid.  At this point the socket is guaranteed to be open (assert!).
	* login/getutline_r.c: Remove unnecessary header files.
	(__getutline_r): Do not call backend setutent.
	* login/getutid_r.c: Remove unnecessary header files.
	(__getutid_r): Do not call backend setutent.
	* login/getutent_r.c: Remove unneccesary header files.
	(__libc_utmp_unknown_functions): Added getutid_r_unknown,
	getutline_r_unknown.
	(setutent_unknown): Only set file backend if setutent for the file
	backend was successful.
	(getutent_r_unknown, pututline_unknown): Call setutent_unknown instead
	of __setutent.  Report failure if no backend was selected.
	(getutid_r_unknown): New function.
	(getutline_r_unknown): New function.
	(__endutent): Reset backend.  This makes sure all backends are checked
	on the next setutent call.

1997-08-08 20:20  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>

	* nis_cache.c: Replace dummy functions.

	* libc.map: Add xdr_sizeof symbol.

	* sunrpc/Makefile: Add xdr_sizeof to routines.
	* sunrpc/rpc/xdr.h: Add xdr_sizeof prototype.
	* sunrpc/xdr_sizeof.c: New, from tirpc 2.3.

1997-08-08  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>

	* sysdeps/mach/bits/libc-lock.h (__libc_once): Define correctly.

1997-08-07  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>

	* sysdeps/mach/hurd/profil.c (fetch_samples): Put parens in the
	right place.

1997-08-06  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>

	* sysdeps/mach/hurd/profil.c (fetch_samples): Do arithmetic on
	PC's in long long to avoid overflow.

1997-08-07  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>

	* sysdeps/mach/bits/libc-lock.h (__libc_once, __libc_once_define):
	New macros.

1997-08-06  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* nis/Makefile (headers): Remove bits/nislib.h.

1997-08-06 14:54  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/mach/hurd/Subdirs: Add login.

1997-08-06 14:23  Klaus Espenlaub  <kespenla@hydra.informatik.uni-ulm.de>

	* db/hash/hash.c (init_hash): Don't use stat() if it doesn't provide
	the preferred block size.

	* login/programs/database.c (store_state_entry): Don't compile if
	there is no ut_type field.
	(store_state_entry, store_process_entry): Use the ut_tv field
	for timestamps if supported.

	* login/programs/utmpdump.c (print_entry): Always use ut_tv field.

	* login/programs/xtmp.c: Fix numerous xtmp/utmp typos.  Use the ut_tv
	field for timestamps if supported.

	* login/programs/xtmp.h: Fix xtmp/utmp typo.

	* sysdeps/posix/defs.c (stdstream): Change (PTR) to (void *).

	* sysdeps/stub/connect.c (connect): Change to __connect, add alias.
	* sysdeps/stub/send.c (send): Likewise.
	* sysdeps/stub/s_exp2f.c: Emit correct stub_warning().
	* sysdeps/stub/statfs.c: Move stub_warning() to the usual place.
	* sysdeps/stub/init-first.c: Add definition of __libc_pid.

1997-08-05 13:28  Philip Blundell  <pb@spring.nexus.co.uk>

	* sysdeps/standalone/arm/bits/errno.h: Add EISDIR, EOPNOTSUPP;
	tidy up formatting.

	* Makefile (subdirs): Remove `login'.
	* sysdeps/unix/Subdirs: New file; build `login' subdirectory
	for Unix systems.

1997-08-05  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/generic/bits/utmpx.h: New file.

	* sysdeps/mach/hurd/Dist: Add some files.
	* sysdeps/mips/Dist: Likewise.
	* sysdeps/mips/mips64/Dist: Likewise.
	* sysdeps/sparc/Dist: Likewise.
	* sysdeps/unix/sysv/linux/mips/Dist: Likewise.
	* sysdeps/unix/sysv/linux/sparc/Dist: Likewise.
	* sysdeps/mips/mipsel/Dist: New file.
	* sysdeps/sparc64/elf/Dist: New file.
	* sysdeps/unix/sysv/linux/sparc64/Dist: New file.

1997-08-05  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* libc.map: Add missing symbols.

1997-08-05  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* manual/socket.texi: Correct typos.

	* manual/math.texi: Correct typos.

	* manual/time.texi (Formatting Date and Time): Likewise.

1997-08-04 13:06  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>

	* gmon/gmon.c (write_gmon): New function; guts from _mcleanup.
	(_mcleanup): Use write_gmon.
	(write_profiling): This function can be safely called at any time
	to write a current histogram without interfering with ongoing
	profiling.

	* sysdeps/mach/hurd/profil.c (fetch_samples): Initialize NSAMPLES.

1997-08-01 17:53  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>

	* sysdeps/mach/hurd/profil.c (fetch_samples): Sample buffer need
	not be vm_deallocated; it's a stack buffer.
	(profil_vm_deallocate): Delete prototype.
	(#include <../mach/RPC_vm_deallocate_rpc.c>): Drop this
	inclusion.
	* sysdeps/mach/hurd/Makefile
	($(common-objpfx)hurd/../mach/RPC_vm_deallocate_rpc.c): Delete
	this rule.

	* sysdeps/mach/hurd/profil.c (fetch_samples): New function, guts
	from profile_waiter.
	(profile_waiter): Use fetch_samples.
	(profil): When turning off profiling, fetch the last bunch of
	samples before disabling PC sampling.
	(fetch_samples): Add prototype.

1997-07-30 12:53  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>

	* sysdeps/mach/hurd/Makefile: Give normal rules for the mach RPC
	source included by profil.c instead of trying to use
	before-compile grot.

1997-07-23 15:04  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>

	* sysdeps/mach/hurd/profil.c (profile_waiter): Do vm_deallocate
	after releasing lock.  Use special RPC stubs and avoid assert,
	thus making this function entirely independent of the threadvar
	mechanism and of cthreads.
	(lock): Convert to be a spin lock instead of a mutex, so that the
	waiter thread need not use cthreads.  Use a fork prepare hook
	instead of _hurd_fork_locks to make sure we are clean before
	forking.
	(fork_profil_child): Renamed from fork_profil.
	(profil_reply_port): New variable.
	(profil_vm_deallocate, profil_task_get_sampled_pcs): Special RPC
	stubs made by special hacks.
	* sysdeps/mach/hurd/Makefile (before-compile): Add the mach RPC
	source files that profil.c needs if we are in the gmon directory.

	* mach/setup-thread.c (__mach_setup_thread): Delete avoidance of a
	cthreads bug that hasn't existed for two years.

	* stdio-common/printf_fp.c (__printf_fp): Correct rounding of numbers
	* locale/programs/locale.c (print_escaped): New function.
	* time/australasia: Likewise.
	(open_database, synchronize_database, initialize_database):
	* nss/nss_files/files-netgrp.c (_nss_netgroup_parseline): Don't
	* Makerules (load-map-file): Currectly handle missing map file.
	cannot rely on M_SQRT2 being defined.
	(log1p): Use __M_SQRT2 not M_SQRT2.

12 files changed, 312 insertions, 279 deletions

diff --git a/login/getutent_r.c b/login/getutent_r.c
index 98c5469463..96c458f3a3 100644
--- a/login/getutent_r.c
+++ b/login/getutent_r.c
@@ -18,20 +18,20 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <assert.h>
 #include <bits/libc-lock.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <utmp.h>
 
 #include "utmp-private.h"
 
 
-/* The various backends we have.  */
+/* Functions defined here.  */
+static int setutent_unknown (void);
 static int getutent_r_unknown (struct utmp *buffer, struct utmp **result);
+static int getutid_r_unknown (const struct utmp *line, struct utmp *buffer,
+			      struct utmp **result);
+static int getutline_r_unknown (const struct utmp *id, struct utmp *buffer,
+				struct utmp **result);
 static struct utmp *pututline_unknown (const struct utmp *data);
-static int setutent_unknown (void);
 static void endutent_unknown (void);
 
 /* Initial Jump table.  */
@@ -39,8 +39,8 @@ struct utfuncs __libc_utmp_unknown_functions =
 {
   setutent_unknown,
   getutent_r_unknown,
-  NULL,
-  NULL,
+  getutid_r_unknown,
+  getutline_r_unknown,
   pututline_unknown,
   endutent_unknown,
   NULL
@@ -53,58 +53,99 @@ struct utfuncs *__libc_utmp_jump_table = &__libc_utmp_unknown_functions;
 __libc_lock_define_initialized (, __libc_utmp_lock)
 
 
-void
-__setutent (void)
+static int
+setutent_unknown (void)
 {
-  __libc_lock_lock (__libc_utmp_lock);
+  int result;
 
-  (*__libc_utmp_jump_table->setutent) ();
+  /* See whether utmpd is running.  */
+  result = (*__libc_utmp_daemon_functions.setutent) ();
+  if (result)
+    __libc_utmp_jump_table = &__libc_utmp_daemon_functions;
+  else
+    {
+      result = (*__libc_utmp_file_functions.setutent) ();
+      if (result)
+	__libc_utmp_jump_table = &__libc_utmp_file_functions;
+    }
 
-  __libc_lock_unlock (__libc_utmp_lock);
+  return result;
 }
-weak_alias (__setutent, setutent)
-weak_alias (__setutent, setutxent)
 
 
-void
-__endutent (void)
+static int
+getutent_r_unknown (struct utmp *buffer, struct utmp **result)
 {
-  __libc_lock_lock (__libc_utmp_lock);
+  /* The backend was not yet initialized.  */
+  if (setutent_unknown ())
+    return (*__libc_utmp_jump_table->getutent_r) (buffer, result);
 
-  (*__libc_utmp_jump_table->endutent) ();
+  /* Not available.  */
+  *result = NULL;
+  return -1;
+}
 
-  __libc_lock_unlock (__libc_utmp_lock);
+
+static int
+getutid_r_unknown (const struct utmp *id, struct utmp *buffer,
+		   struct utmp **result)
+{
+  /* The backend was not yet initialized.  */
+  if (setutent_unknown ())
+    return (*__libc_utmp_jump_table->getutid_r) (id, buffer, result);
+
+  /* Not available.  */
+  *result = NULL;
+  return -1;
 }
-weak_alias (__endutent, endutent)
-weak_alias (__endutent, endutxent)
 
 
 static int
-setutent_unknown (void)
+getutline_r_unknown (const struct utmp *line, struct utmp *buffer,
+		     struct utmp **result)
 {
-  int result;
+  /* The backend was not yet initialized.  */
+  if (setutent_unknown ())
+    return (*__libc_utmp_jump_table->getutline_r) (line, buffer, result);
 
-  /* See whether utmpd is running.  */
-  result = (*__libc_utmp_daemon_functions.setutent) ();
-  if (result)
-    __libc_utmp_jump_table = &__libc_utmp_daemon_functions;
-  else
-    {
-      result = (*__libc_utmp_file_functions.setutent) ();
-      __libc_utmp_jump_table = &__libc_utmp_file_functions;
-    }
+  /* Not available.  */
+  *result = NULL;
+  return -1;
+}
 
-  return result;
+
+static struct utmp *
+pututline_unknown (const struct utmp *data)
+{
+  /* The backend was not yet initialized.  */
+  if (setutent_unknown ())
+    return (*__libc_utmp_jump_table->pututline) (data);
+
+  /* Not available.  */
+  return NULL;
 }
 
 
 static void
 endutent_unknown (void)
 {
-  /* Huh, how do we came here?  Nothing to do.  */
+  /* Nothing to do.  */
 }
 
 
+void
+__setutent (void)
+{
+  __libc_lock_lock (__libc_utmp_lock);
+
+  (*__libc_utmp_jump_table->setutent) ();
+
+  __libc_lock_unlock (__libc_utmp_lock);
+}
+weak_alias (__setutent, setutent)
+weak_alias (__setutent, setutxent)
+
+
 int
 __getutent_r (struct utmp *buffer, struct utmp **result)
 {
@@ -121,16 +162,6 @@ __getutent_r (struct utmp *buffer, struct utmp **result)
 weak_alias (__getutent_r, getutent_r)
 
 
-static int
-getutent_r_unknown (struct utmp *buffer, struct utmp **result)
-{
-  /* It is not yet initialized.  */
-  __setutent ();
-
-  return (*__libc_utmp_jump_table->getutent_r) (buffer, result);
-}
-
-
 struct utmp *
 __pututline (const struct utmp *data)
 {
@@ -148,11 +179,15 @@ weak_alias (__pututline, pututline)
 weak_alias (__pututline, pututxline)
 
 
-static struct utmp *
-pututline_unknown (const struct utmp *data)
+void
+__endutent (void)
 {
-  /* It is not yet initialized.  */
-  __setutent ();
+  __libc_lock_lock (__libc_utmp_lock);
 
-  return (*__libc_utmp_jump_table->pututline) (data);
+  (*__libc_utmp_jump_table->endutent) ();
+  __libc_utmp_jump_table = &__libc_utmp_unknown_functions;
+
+  __libc_lock_unlock (__libc_utmp_lock);
 }
+weak_alias (__endutent, endutent)
+weak_alias (__endutent, endutxent)
diff --git a/login/getutid_r.c b/login/getutid_r.c
index 90b75b8c01..3d5d63de29 100644
--- a/login/getutid_r.c
+++ b/login/getutid_r.c
@@ -20,8 +20,6 @@
 
 #include <errno.h>
 #include <bits/libc-lock.h>
-#include <string.h>
-#include <unistd.h>
 #include <utmp.h>
 
 #include "utmp-private.h"
@@ -38,7 +36,7 @@ int
 __getutid_r (const struct utmp *id, struct utmp *buffer, struct utmp **result)
 {
 #if (_HAVE_UT_ID - 0) && (_HAVE_UT_TYPE - 0)
-  int retval = -1;
+  int retval;
 
   /* Test whether ID has any of the legal types.  */
   if (id->ut_type != RUN_LVL && id->ut_type != BOOT_TIME
@@ -54,11 +52,7 @@ __getutid_r (const struct utmp *id, struct utmp *buffer, struct utmp **result)
 
   __libc_lock_lock (__libc_utmp_lock);
 
-  /* Not yet initialized.  */
-  if ((*__libc_utmp_jump_table->setutent) ())
-    retval = (*__libc_utmp_jump_table->getutid_r) (id, buffer, result);
-  else
-    *result = NULL;
+  retval = (*__libc_utmp_jump_table->getutid_r) (id, buffer, result);
 
   __libc_lock_unlock (__libc_utmp_lock);
 
diff --git a/login/getutline.c b/login/getutline.c
index 16a02f6e89..1e1ecb1ce3 100644
--- a/login/getutline.c
+++ b/login/getutline.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 *
-getutline (const struct utmp *line)
+__getutline (const struct utmp *line)
 {
   struct utmp *result;
 
@@ -34,3 +34,5 @@ getutline (const struct utmp *line)
 
   return result;
 }
+weak_alias (__getutline, getutline)
+weak_alias (__getutline, getutxline)
diff --git a/login/getutline_r.c b/login/getutline_r.c
index a1bdc0bc4e..57335941c1 100644
--- a/login/getutline_r.c
+++ b/login/getutline_r.c
@@ -20,8 +20,6 @@
 
 #include <errno.h>
 #include <bits/libc-lock.h>
-#include <string.h>
-#include <unistd.h>
 #include <utmp.h>
 
 #include "utmp-private.h"
@@ -38,15 +36,11 @@ int
 __getutline_r (const struct utmp *line, struct utmp *buffer,
 	       struct utmp **result)
 {
-  int retval = -1;
+  int retval;
 
   __libc_lock_lock (__libc_utmp_lock);
 
-  /* Not yet initialized.  */
-  if ((*__libc_utmp_jump_table->setutent) ())
-    retval = (*__libc_utmp_jump_table->getutline_r) (line, buffer, result);
-  else
-    *result = NULL;
+  retval = (*__libc_utmp_jump_table->getutline_r) (line, buffer, result);
 
   __libc_lock_unlock (__libc_utmp_lock);
 
diff --git a/login/logout.c b/login/logout.c
index 8a406c01ca..9a87fe4e3f 100644
--- a/login/logout.c
+++ b/login/logout.c
@@ -30,7 +30,7 @@ logout (const char *line)
   int result = 0;
 
   /* Tell that we want to use the UTMP file.  */
-  if (utmpname (_PATH_UTMP) == 0)
+  if (utmpname (_PATH_UTMP) == -1)
     return 0;
 
   /* Open UTMP file.  */
diff --git a/login/programs/database.c b/login/programs/database.c
index 00d573f336..7044cd8d87 100644
--- a/login/programs/database.c
+++ b/login/programs/database.c
@@ -88,7 +88,7 @@ open_database (const char *file, const char *old_file)
 	  error (0, errno, "%s", old_file);
 	  goto return_error;
 	}
-  
+
       database->old_file = strdup (old_file);
       if (database->old_file == NULL)
 	{
@@ -100,12 +100,12 @@ open_database (const char *file, const char *old_file)
   /* Initialize database.  */
   if (initialize_database (database) < 0)
     goto return_error;
-  
+
   return database;
 
 return_error:
   close_database (database);
-  
+
   return NULL;
 }
 
@@ -121,16 +121,16 @@ synchronize_database (utmp_database *database)
     {
       time_t curtime;
       time_t mtime;
-      
+
       curtime = time (NULL);
-      
+
       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)
 	{
 	  int position = 0;
@@ -141,7 +141,7 @@ synchronize_database (utmp_database *database)
 	    {
 	      if (read_old_entry (database, position, &old_entry) < 0)
 		break;
-	      
+
 	      if (read_entry (database, position, &entry) < 0
 		  || !compare_entry (&old_entry, &entry))
 		{
@@ -157,7 +157,7 @@ synchronize_database (utmp_database *database)
 
 	  database->mtime = curtime;
 	}
-      
+
     }
 
   return 0;
@@ -175,7 +175,7 @@ close_database (utmp_database *database)
 
   if (database->old_fd >= 0)
     close (database->old_fd);
-  
+
   /* Free allocated memory.  */
   if (database->file)
     free (database->file);
@@ -200,7 +200,7 @@ read_entry (utmp_database *database, int position, struct utmp *entry)
   nbytes = read (database->fd, entry, sizeof (struct utmp));
   if (nbytes != sizeof (struct utmp))
     return -1;
-  
+
   return 0;
 }
 
@@ -221,7 +221,7 @@ write_entry (utmp_database *database, int position,
   fl.l_type = F_WRLCK;
   fl.l_whence = SEEK_SET;
   fcntl (database->fd, F_SETLKW, &fl);
-  
+
   offset = position * sizeof (struct utmp);
   if (lseek (database->fd, offset, SEEK_SET) < 0)
     goto fail;
@@ -259,7 +259,7 @@ append_entry (utmp_database *database, const struct utmp *entry)
   fl.l_type = F_WRLCK;
   fl.l_whence = SEEK_SET;
   fcntl (database->fd, F_SETLKW, &fl);
-  
+
   offset = lseek (database->fd, 0, SEEK_END);
   if (offset % sizeof (struct utmp) != 0)
     {
@@ -278,7 +278,7 @@ append_entry (utmp_database *database, const struct utmp *entry)
     }
 
   result = offset / sizeof (struct utmp);
-  
+
 fail:
   /* And unlock the file.  */
   fl.l_type = F_UNLCK;
@@ -303,7 +303,7 @@ read_old_entry (utmp_database *database, int position,
   nbytes = read (database->old_fd, &old_entry, sizeof (struct xtmp));
   if (nbytes != sizeof (struct xtmp))
     return -1;
-  
+
   xtmp_to_utmp (&old_entry, entry);
   return 0;
 }
@@ -318,7 +318,7 @@ write_old_entry (utmp_database *database, int position,
   off_t offset;
 
   utmp_to_xtmp (entry, &old_entry);
-  
+
   offset = position * sizeof (struct xtmp);
   if (lseek (database->old_fd, offset, SEEK_SET) < 0)
     return -1;
@@ -337,7 +337,7 @@ initialize_database (utmp_database *database)
 {
   struct utmp entry;
   int position = 0;
-  
+
   assert (database);
 
   /* Check if there is a file in the old format to read.  */
@@ -395,6 +395,7 @@ initialize_database (utmp_database *database)
 }
 
 
+#if _HAVE_UT_TYPE - 0
 static int
 store_state_entry (utmp_database *database, int old_position,
 		   const struct utmp *old_entry)
@@ -413,7 +414,7 @@ store_state_entry (utmp_database *database, int old_position,
       /* Read the next entry.  */
       if (read_entry (database, new_position, &new_entry) < 0)
 	break;
-      
+
       if (old_entry->ut_type == new_entry.ut_type)
 	{
 	  found = 1;
@@ -428,16 +429,23 @@ store_state_entry (utmp_database *database, int old_position,
     {
       const struct utmp *entry;
 
-      if (old_entry->ut_time > new_entry.ut_time)
+      if (
+#if _HAVE_UT_TV - 0
+	  old_entry->ut_tv.tv_sec > new_entry.ut_tv.tv_sec
+#else
+	  old_entry->ut_time > new_entry.ut_time
+#endif
+	  )
 	entry = old_entry;
       else
 	entry = &new_entry;
-      
+
       return replace_entry (database, old_position, new_position, entry);
     }
 
   return store_entry (database, old_position, old_entry);
 }
+#endif
 
 
 static int
@@ -468,11 +476,17 @@ store_process_entry (utmp_database *database, int old_position,
     {
       const struct utmp *entry;
 
-      if (old_entry->ut_time > new_entry.ut_time)
+      if (
+#if _HAVE_UT_TV - 0
+	  old_entry->ut_tv.tv_sec > new_entry.ut_tv.tv_sec
+#else
+	  old_entry->ut_time > new_entry.ut_time
+#endif
+	  )
 	entry = old_entry;
       else
 	entry = &new_entry;
-      
+
       return replace_entry (database, old_position, new_position, entry);
     }
 
@@ -485,7 +499,7 @@ replace_entry (utmp_database *database, int old_position, int new_position,
 	       const struct utmp *entry)
 {
   struct utmp tmp;
-  
+
   if (read_entry (database, old_position, &tmp) < 0
       || write_entry (database, old_position, entry) < 0
       || write_entry (database, new_position, &tmp) < 0)
@@ -518,7 +532,7 @@ static int
 get_mtime (int filedes, time_t *timer)
 {
   struct stat st;
-  
+
   if (fstat (filedes, &st) < 0)
     return -1;
 
diff --git a/login/programs/utmpdump.c b/login/programs/utmpdump.c
index e1422b5028..7be404ce24 100644
--- a/login/programs/utmpdump.c
+++ b/login/programs/utmpdump.c
@@ -29,9 +29,15 @@
 void
 print_entry (struct utmp *up)
 {
+#if _HAVE_UT_TV - 0
   printf ("[%d] [%05d] [%-4.4s] [%-8.8s] [%-12.12s] [%-15.15s] [%ld]\n",
 	  up->ut_type, up->ut_pid, up->ut_id, up->ut_user,
-	  up->ut_line, 4 + ctime (&up->ut_time), up->ut_tv.tv_usec);
+	  up->ut_line, 4 + ctime (&up->ut_tv.tv_sec), up->ut_tv.tv_usec);
+#else
+  printf ("[%d] [%05d] [%-4.4s] [%-8.8s] [%-12.12s] [%-15.15s]\n",
+	  up->ut_type, up->ut_pid, up->ut_id, up->ut_user,
+	  up->ut_line, 4 + ctime (&up->ut_time));
+#endif
 }
 
 int
@@ -41,13 +47,13 @@ main (int argc, char *argv[])
 
   if (argc > 1)
     utmpname (argv[1]);
-  
+
   setutent ();
 
   while ((up = getutent ()))
     print_entry (up);
 
   endutent ();
-  
+
   return EXIT_SUCCESS;
 }
diff --git a/login/programs/xtmp.c b/login/programs/xtmp.c
index d2d5feee3b..105145b01d 100644
--- a/login/programs/xtmp.c
+++ b/login/programs/xtmp.c
@@ -42,7 +42,11 @@ xtmp_to_utmp (const struct xtmp *xtmp, struct utmp *utmp)
 #if _HAVE_XT_ID - 0
   strncpy (utmp->ut_id, xtmp->xt_id, sizeof xtmp->xt_id);
 #endif
+#if _HAVE_UT_TV - 0
+  utmp->ut_tv.tv_sec = xtmp->xt_time;
+#else
   utmp->ut_time = xtmp->xt_time;
+#endif
   strncpy (utmp->ut_user, xtmp->xt_user, XT_NAMESIZE);
 #if _HAVE_XT_HOST - 0
   strncpy (utmp->ut_host, xtmp->xt_host, XT_HOSTSIZE);
@@ -66,7 +70,11 @@ utmp_to_xtmp (const struct utmp *utmp, struct xtmp *xtmp)
 #if _HAVE_XT_ID - 0
   strncpy (xtmp->xt_id, utmp->ut_id, sizeof xtmp->xt_id);
 #endif
+#if _HAVE_UT_TV - 0
+  xtmp->xt_time = utmp->ut_tv.tv_sec;
+#else
   xtmp->xt_time = utmp->ut_time;
+#endif
   strncpy (xtmp->xt_user, utmp->ut_user, XT_NAMESIZE);
 #if _HAVE_XT_HOST - 0
   strncpy (xtmp->xt_host, utmp->ut_host, XT_HOSTSIZE);
@@ -79,24 +87,28 @@ utmp_to_xtmp (const struct utmp *utmp, struct xtmp *xtmp)
    function returns 1 if the information that is in both old and new
    style entries is identical.  Otherwise this function returns 0.  */
 int
-compare_entry (const struct utmp *xtmp, const struct utmp *utmp)
+compare_entry (const struct xtmp *xtmp, const struct utmp *utmp)
 {
   return
     (
 #if _HAVE_XT_TYPE - 0
-     xtmp->ut_type == utmp->ut_type
+     xtmp->xt_type == utmp->ut_type
 #endif
 #if _HAVE_XT_PID - 0
-     && xtmp->ut_pid == utmp->ut_pid
+     && xtmp->xt_pid == utmp->ut_pid
 #endif
-     && !strncmp (xtmp->ut_line, utmp->ut_line, XT_LINESIZE - 1)
+     && !strncmp (xtmp->xt_line, utmp->ut_line, XT_LINESIZE - 1)
 #if _HAVE_XT_ID - 0
-     && !strncmp (xtmp->ut_id, utmp->ut_id, sizeof utmp->ut_id)
+     && !strncmp (xtmp->xt_id, utmp->ut_id, sizeof utmp->ut_id)
+#endif
+#if _HAVE_UT_TV - 0
+     && xtmp->xt_time == utmp->ut_tv.tv_sec
+#else
+     && xtmp->xt_time == utmp->ut_time
 #endif
-     && xtmp->ut_time == utmp->ut_time
-     && !strncmp (xtmp->ut_user, utmp->ut_user, XT_NAMESIZE)
+     && !strncmp (xtmp->xt_user, utmp->ut_user, XT_NAMESIZE)
 #if _HAVE_XT_HOST - 0
-     && !strncmp (xtmp->ut_host, utmp->ut_host, XT_HOSTSIZE - 1)
+     && !strncmp (xtmp->xt_host, utmp->ut_host, XT_HOSTSIZE - 1)
 #endif
-     && xtmp->ut_addr == utmp->ut_addr);
+     && xtmp->xt_addr == utmp->ut_addr);
 }
diff --git a/login/programs/xtmp.h b/login/programs/xtmp.h
index 8fa982ee4f..508993248a 100644
--- a/login/programs/xtmp.h
+++ b/login/programs/xtmp.h
@@ -50,7 +50,7 @@ struct xtmp
 
 extern void xtmp_to_utmp (const struct xtmp *xtmp, struct utmp *utmp);
 extern void utmp_to_xtmp (const struct utmp *utmp, struct xtmp *xtmp);
-extern int compare_entry (const struct utmp *xtmp,
+extern int compare_entry (const struct xtmp *xtmp,
 			  const struct utmp *utmp);
 
 #endif /* xtmp.h  */
diff --git a/login/utmp_daemon.c b/login/utmp_daemon.c
index 5907e06e2d..db3c90e428 100644
--- a/login/utmp_daemon.c
+++ b/login/utmp_daemon.c
@@ -17,8 +17,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <assert.h>
 #include <errno.h>
-#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -31,7 +31,7 @@
 
 
 /* Descriptor for the socket.  */
-static int daemon_sock = INT_MIN;
+static int daemon_sock = -1;
 
 
 /* Functions defined here.  */
@@ -59,12 +59,13 @@ struct utfuncs __libc_utmp_daemon_functions =
 
 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_getutline (int sock, const struct utmp *line,
+			 struct utmp *buffer);
+static int do_pututline (int sock, const struct utmp *utmp);
+static int do_endutent (int sock);
 static int do_updwtmp (int sock, const char *file,
 		       const struct utmp *utmp);
 
@@ -79,7 +80,7 @@ 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);
@@ -100,33 +101,10 @@ setutent_daemon (void)
 }
 
 
-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;
-    }
+  assert (daemon_sock >= 0);
 
   /* Send request to the daemon.  */
   if (do_getutent (daemon_sock, buffer) < 0)
@@ -141,20 +119,16 @@ getutent_r_daemon (struct utmp *buffer, struct utmp **result)
 
 
 static int
-getutline_r_daemon (const struct utmp *line, struct utmp *buffer,
-		    struct utmp **result)
+getutid_r_daemon (const struct utmp *id, struct utmp *buffer,
+		  struct utmp **result)
 {
-  if (daemon_sock < 0)
-    {
-      *result = NULL;
-      return -1;
-    }
+  assert (daemon_sock >= 0);
 
   /* Send request to the daemon.  */
-  if (do_getutline (daemon_sock, line, buffer) < 0)
+  if (do_getutid (daemon_sock, id, buffer) < 0)
     {
       *result = NULL;
-      return -1;;
+      return -1;
     }
 
   *result = buffer;
@@ -163,17 +137,13 @@ getutline_r_daemon (const struct utmp *line, struct utmp *buffer,
 
 
 static int
-getutid_r_daemon (const struct utmp *id, struct utmp *buffer,
-		  struct utmp **result)
+getutline_r_daemon (const struct utmp *line, struct utmp *buffer,
+		    struct utmp **result)
 {
-  if (daemon_sock < 0)
-    {
-      *result = NULL;
-      return -1;
-    }
+  assert (daemon_sock >= 0);
 
   /* Send request to the daemon.  */
-  if (do_getutid (daemon_sock, id, buffer) < 0)
+  if (do_getutline (daemon_sock, line, buffer) < 0)
     {
       *result = NULL;
       return -1;
@@ -187,13 +157,7 @@ getutid_r_daemon (const struct utmp *id, struct utmp *buffer,
 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;
+  assert (daemon_sock >= 0);
 
   /* Send request to the daemon.  */
   if (do_pututline (daemon_sock, utmp) < 0)
@@ -203,6 +167,19 @@ pututline_daemon (const struct utmp *utmp)
 }
 
 
+static void
+endutent_daemon (void)
+{
+  assert (daemon_sock >= 0);
+
+  /* Send request to the daemon.  */
+  do_endutent (daemon_sock);
+
+  close (daemon_sock);
+  daemon_sock = -1;
+}
+
+
 static int
 updwtmp_daemon (const char *file, const struct utmp *utmp)
 {
@@ -233,11 +210,11 @@ do_setutent (int sock)
   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;
@@ -286,24 +263,27 @@ do_getutent (int sock, struct utmp *buffer)
 }
 
 static int
-do_endutent (int sock)
+do_getutid (int sock, const struct utmp *id, struct utmp *buffer)
 {
-  endutent_request request;
-  endutent_reply reply;
+  getutid_request request;
+  getutid_reply reply;
 
   request.header.version = UTMPD_VERSION;
-  request.header.size = sizeof (endutent_request);
-  request.header.type = UTMPD_REQ_ENDUTENT;
+  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 (endutent_reply);
-  reply.header.type = UTMPD_REQ_ENDUTENT;
+  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;
 }
@@ -335,45 +315,42 @@ do_getutline (int sock, const struct utmp *line, struct utmp *buffer)
 }
 
 static int
-do_getutid (int sock, const struct utmp *id, struct utmp *buffer)
+do_pututline (int sock, const struct utmp *utmp)
 {
-  getutid_request request;
-  getutid_reply reply;
+  pututline_request request;
+  pututline_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));
+  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 (getutid_reply);
-  reply.header.type = UTMPD_REQ_GETUTID;
+  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);
-  else
-    memcpy (buffer, &reply.entry, sizeof (struct utmp));
 
   return reply.result;
 }
 
 static int
-do_pututline (int sock, const struct utmp *utmp)
+do_endutent (int sock)
 {
-  pututline_request request;
-  pututline_reply reply;
+  endutent_request request;
+  endutent_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));
+  request.header.size = sizeof (endutent_request);
+  request.header.type = UTMPD_REQ_ENDUTENT;
 
   reply.header.version = UTMPD_VERSION;
-  reply.header.size = sizeof (pututline_reply);
-  reply.header.type = UTMPD_REQ_PUTUTLINE;
+  reply.header.size = sizeof (endutent_reply);
+  reply.header.type = UTMPD_REQ_ENDUTENT;
 
   if (send_request (sock, &request.header, &reply.header) < 0)
     return -1;
@@ -392,11 +369,11 @@ do_updwtmp (int sock, const char *file, const struct utmp *utmp)
   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;
diff --git a/login/utmp_file.c b/login/utmp_file.c
index 6d6e05b292..bea63644f7 100644
--- a/login/utmp_file.c
+++ b/login/utmp_file.c
@@ -18,13 +18,11 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <limits.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
 #include <unistd.h>
 #include <utmp.h>
 
@@ -32,9 +30,10 @@
 
 
 /* Descriptor for the file and position.  */
-static int file_fd = INT_MIN;
+static int file_fd = -1;
 static off_t file_offset;
 
+/* Cache for the last read entry.  */
 static struct utmp last_entry;
 
 
@@ -68,14 +67,14 @@ setutent_file (void)
   if (file_fd < 0)
     {
       const char *file_name = __libc_utmp_file_name;
-      
+
       if (strcmp (__libc_utmp_file_name, _PATH_UTMP) == 0
 	  && __access (_PATH_UTMP "x", F_OK) == 0)
 	file_name = _PATH_UTMP "x";
       else if (strcmp (__libc_utmp_file_name, _PATH_WTMP) == 0
 	       && __access (_PATH_WTMP "x", F_OK) == 0)
 	file_name = _PATH_WTMP "x";
-	       
+
       file_fd = open (file_name, O_RDWR);
       if (file_fd == -1)
 	{
@@ -96,18 +95,8 @@ setutent_file (void)
   /* Make sure the entry won't match.  */
   last_entry.ut_type = -1;
 #endif
-  
-  return 1;
-}
-
-
-static void
-endutent_file (void)
-{
-  if (file_fd >= 0)
-    close (file_fd);
 
-  file_fd = INT_MIN;
+  return 1;
 }
 
 
@@ -117,11 +106,9 @@ getutent_r_file (struct utmp *buffer, struct utmp **result)
   ssize_t nbytes;
   struct flock fl;			/* Information struct for locking.  */
 
-  /* Open utmp file if not already done.  */
-  if (file_fd == INT_MIN)
-    setutent_file ();
+  assert (file_fd >= 0);
 
-  if (file_fd == -1 || file_offset == -1l)
+  if (file_offset == -1l)
     {
       /* Not available.  */
       *result = NULL;
@@ -131,12 +118,16 @@ getutent_r_file (struct utmp *buffer, struct utmp **result)
   /* XXX The following is not perfect.  Instead of locking the file itself
      Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl> suggests to
      use an extra locking file.  */
+  /* XXX I think using an extra locking file does not solve the
+     problems.  Instead we should set an alarm, which causes fcntl to
+     fail, as in ../nis/lckcache.c.
+     Mark Kettenis <kettenis@phys.uva.nl>.  */
 
   /* Try to get the lock.  */
   memset (&fl, '\0', sizeof (struct flock));
   fl.l_type = F_RDLCK;
   fl.l_whence = SEEK_SET;
-  fcntl (file_fd, F_SETLKW, &fl);
+  fcntl (file_fd, F_SETLK, &fl);
 
   /* Read the next entry.  */
   nbytes = read (file_fd, &last_entry, sizeof (struct utmp));
@@ -162,62 +153,6 @@ getutent_r_file (struct utmp *buffer, struct utmp **result)
 }
 
 
-/* For implementing this function we don't use the getutent_r function
-   because we can avoid the reposition on every new entry this way.  */
-static int
-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;
-      return -1;
-    }
-
-  /* Try to get the lock.  */
-  memset (&fl, '\0', sizeof (struct flock));
-  fl.l_type = F_RDLCK;
-  fl.l_whence = SEEK_SET;
-  fcntl (file_fd, F_SETLKW, &fl);
-
-  while (1)
-    {
-      /* Read the next entry.  */
-      if (read (file_fd, &last_entry, sizeof (struct utmp))
-	  != sizeof (struct utmp))
-	{
-	  __set_errno (ESRCH);
-	  file_offset = -1l;
-	  *result = NULL;
-	  goto unlock_return;
-	}
-      file_offset += sizeof (struct utmp);
-
-      /* Stop if we found a user or login entry.  */
-      if (
-#if _HAVE_UT_TYPE - 0
-	  (last_entry.ut_type == USER_PROCESS
-	   || last_entry.ut_type == LOGIN_PROCESS)
-	  &&
-#endif
-	  !strncmp (line->ut_line, last_entry.ut_line, sizeof line->ut_line))
-	break;
-    }
-
-  memcpy (buffer, &last_entry, sizeof (struct utmp));
-  *result = buffer;
-
-unlock_return:
-  /* And unlock the file.  */
-  fl.l_type = F_UNLCK;
-  fcntl (file_fd, F_SETLKW, &fl);
-
-  return ((*result == NULL) ? -1 : 0);
-}
-
-
 static int
 proc_utmp_eq (const struct utmp *entry, const struct utmp *match)
 {
@@ -308,7 +243,7 @@ internal_getut_r (const struct utmp *id, struct utmp *buffer)
 unlock_return:
   /* And unlock the file.  */
   fl.l_type = F_UNLCK;
-  fcntl (file_fd, F_SETLKW, &fl);
+  fcntl (file_fd, F_SETLK, &fl);
 
   return result;
 }
@@ -320,7 +255,9 @@ static int
 getutid_r_file (const struct utmp *id, struct utmp *buffer,
 		struct utmp **result)
 {
-  if (file_fd < 0 || file_offset == -1l)
+  assert (file_fd >= 0);
+
+  if (file_offset == -1l)
     {
       *result = NULL;
       return -1;
@@ -339,6 +276,64 @@ getutid_r_file (const struct utmp *id, struct utmp *buffer,
 }
 
 
+/* For implementing this function we don't use the getutent_r function
+   because we can avoid the reposition on every new entry this way.  */
+static int
+getutline_r_file (const struct utmp *line, struct utmp *buffer,
+		  struct utmp **result)
+{
+  struct flock fl;
+
+  assert (file_fd >= 0);
+
+  if (file_offset == -1l)
+    {
+      *result = NULL;
+      return -1;
+    }
+
+  /* Try to get the lock.  */
+  memset (&fl, '\0', sizeof (struct flock));
+  fl.l_type = F_RDLCK;
+  fl.l_whence = SEEK_SET;
+  fcntl (file_fd, F_SETLKW, &fl);
+
+  while (1)
+    {
+      /* Read the next entry.  */
+      if (read (file_fd, &last_entry, sizeof (struct utmp))
+	  != sizeof (struct utmp))
+	{
+	  __set_errno (ESRCH);
+	  file_offset = -1l;
+	  *result = NULL;
+	  goto unlock_return;
+	}
+      file_offset += sizeof (struct utmp);
+
+      /* Stop if we found a user or login entry.  */
+      if (
+#if _HAVE_UT_TYPE - 0
+	  (last_entry.ut_type == USER_PROCESS
+	   || last_entry.ut_type == LOGIN_PROCESS)
+	  &&
+#endif
+	  !strncmp (line->ut_line, last_entry.ut_line, sizeof line->ut_line))
+	break;
+    }
+
+  memcpy (buffer, &last_entry, sizeof (struct utmp));
+  *result = buffer;
+
+unlock_return:
+  /* And unlock the file.  */
+  fl.l_type = F_UNLCK;
+  fcntl (file_fd, F_SETLK, &fl);
+
+  return ((*result == NULL) ? -1 : 0);
+}
+
+
 static struct utmp *
 pututline_file (const struct utmp *data)
 {
@@ -347,13 +342,7 @@ pututline_file (const struct utmp *data)
   struct utmp *pbuf;
   int found;
 
-  /* Open utmp file if not already done.  */
-  if (file_fd == INT_MIN)
-    setutent_file ();
-
-  if (file_fd == -1)
-    /* Something went wrong.  */
-    return NULL;
+  assert (file_fd >= 0);
 
   /* Find the correct place to insert the data.  */
   if (file_offset > 0
@@ -375,7 +364,7 @@ pututline_file (const struct utmp *data)
   memset (&fl, '\0', sizeof (struct flock));
   fl.l_type = F_WRLCK;
   fl.l_whence = SEEK_SET;
-  fcntl (file_fd, F_SETLKW, &fl);
+  fcntl (file_fd, F_SETLK, &fl);
 
   if (found < 0)
     {
@@ -418,12 +407,22 @@ pututline_file (const struct utmp *data)
  unlock_return:
    /* And unlock the file.  */
   fl.l_type = F_UNLCK;
-  fcntl (file_fd, F_SETLKW, &fl);
+  fcntl (file_fd, F_SETLK, &fl);
 
   return pbuf;
 }
 
 
+static void
+endutent_file (void)
+{
+  assert (file_fd >= 0);
+
+  close (file_fd);
+  file_fd = -1;
+}
+
+
 static int
 updwtmp_file (const char *file, const struct utmp *utmp)
 {
@@ -441,7 +440,7 @@ updwtmp_file (const char *file, const struct utmp *utmp)
   memset (&fl, '\0', sizeof (struct flock));
   fl.l_type = F_WRLCK;
   fl.l_whence = SEEK_SET;
-  fcntl (fd, F_SETLKW, &fl);
+  fcntl (fd, F_SETLK, &fl);
 
   /* Remember original size of log file.  */
   offset = lseek (fd, 0, SEEK_END);
diff --git a/login/utmpname.c b/login/utmpname.c
index c0b6df2ce7..e0a78aff42 100644
--- a/login/utmpname.c
+++ b/login/utmpname.c
@@ -44,6 +44,7 @@ __utmpname (const char *file)
 
   /* Close the old file.  */
   (*__libc_utmp_jump_table->endutent) ();
+  __libc_utmp_jump_table = &__libc_utmp_unknown_functions;
 
   if (strcmp (file, __libc_utmp_file_name) != 0)
     {
@@ -68,7 +69,6 @@ __utmpname (const char *file)
 	}
     }
 
-  __libc_utmp_jump_table = &__libc_utmp_unknown_functions;
   result = 0;
 
 done: