about summary refs log tree commit diff
path: root/login/getutent_r.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-04-18 18:48:05 +0000
committerUlrich Drepper <drepper@redhat.com>2000-04-18 18:48:05 +0000
commit33c50f1061483e6327321405a448d4574ddedbcd (patch)
tree3938d8ece000e684ca2533b84f416b46af7be316 /login/getutent_r.c
parent74f998221da8e1719ac95add005110676ebad6f2 (diff)
downloadglibc-33c50f1061483e6327321405a448d4574ddedbcd.tar.gz
glibc-33c50f1061483e6327321405a448d4574ddedbcd.tar.xz
glibc-33c50f1061483e6327321405a448d4574ddedbcd.zip
Update.
	* login/utmp_daemon.c: Removed.
	* login/getutent_r.c: Remove references to daemon functions.
	* login/utmp-private.h (__libc_utmp_daemon_functions): Remove
	declaration.
Diffstat (limited to 'login/getutent_r.c')
-rw-r--r--login/getutent_r.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/login/getutent_r.c b/login/getutent_r.c
index 8391331cd5..b8f17eead4 100644
--- a/login/getutent_r.c
+++ b/login/getutent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 2000 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.
@@ -58,16 +58,9 @@ setutent_unknown (void)
 {
   int result;
 
-  /* See whether utmpd is running.  */
-  result = (*__libc_utmp_daemon_functions.setutent) ();
+  result = (*__libc_utmp_file_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_utmp_jump_table = &__libc_utmp_file_functions;
 
   return result;
 }