about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-10-29 21:41:19 -0700
committerUlrich Drepper <drepper@redhat.com>2009-10-29 21:41:19 -0700
commit5debe363133d76bfaf60597392ce2629a1920506 (patch)
tree1932b0f751efa3af1fb26adc41f02cb14ba3da0b
parent801720e63b20e3b8215764ff0d68a29534ca7e62 (diff)
downloadglibc-5debe363133d76bfaf60597392ce2629a1920506.tar.gz
glibc-5debe363133d76bfaf60597392ce2629a1920506.tar.xz
glibc-5debe363133d76bfaf60597392ce2629a1920506.zip
Bump timeout for utmp operations to 10s.
-rw-r--r--ChangeLog3
-rw-r--r--login/utmp_file.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 593de06d1a..0ed1d5cdd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-10-29  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #10564]
+	* login/utmp_file.c (TIMEOUT): Increase to 10.
+
 	[BZ #10609]
 	* sysdeps/unix/sysv/linux/faccessat.c: Fix handling of empty parameters
 	for file names in case the syscall is not available.
diff --git a/login/utmp_file.c b/login/utmp_file.c
index f32144d1f7..d19a2c9c4d 100644
--- a/login/utmp_file.c
+++ b/login/utmp_file.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2004, 2007, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2004, 2007, 2008, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>
    and Paul Janzen <pcj@primenet.com>, 1996.
@@ -45,7 +45,7 @@ static struct utmp last_entry;
 
 /* Locking timeout.  */
 #ifndef TIMEOUT
-# define TIMEOUT 1
+# define TIMEOUT 10
 #endif
 
 /* Do-nothing handler for locking timeout.  */