Update.

2000-04-18  Ulrich Drepper  <drepper@redhat.com>

	* login/programs/connection.c: Removed.
	* login/programs/database.c Removed.
	* login/programs/error.c: Removed.
	* login/programs/request.c: Removed.
	* login/programs/xtmp.c: Removed.
	* login/programs/xtmp.h: Removed.
	* login/Makefile: Remove rules for utmpd.
	* login/README.utmpd: Removed.

6 files changed, 0 insertions, 1649 deletions

diff --git a/login/programs/connection.c b/login/programs/connection.c
deleted file mode 100644
index 4e1663189d..0000000000
--- a/login/programs/connection.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* 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 <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <unistd.h>
-
-#include "utmpd-private.h"
-
-
-/* Prototypes for the local functions.  */
-static client_connection *alloc_connection (void);
-static void free_connection (client_connection *connection);
-static int set_nonblock_flag (int desc, int value);
-
-
-/* The head of the connection list.  */
-static client_connection *connection_list = NULL;
-
-
-/* Accept connection on SOCK, with access permissions given by ACCESS.
-   Returns a pointer to a newly allocated client_connection if
-   successful, NULL if not.  */
-client_connection *
-accept_connection (int sock, int access)
-{
-  client_connection *connection;
-
-  connection = alloc_connection ();
-  if (connection == NULL)
-    return NULL;
-
-  connection->sock = accept (sock, NULL, NULL);
-  connection->access = access;
-  if (connection->sock < 0)
-    {
-      free_connection (connection);
-      return NULL;
-    }
-  
-  if (set_nonblock_flag (connection->sock, 1) < 0)
-    {
-      close_connection (connection);
-      return NULL;
-    }
-
-  return connection;  
-}
-
-
-/* Close CONNECTION.  */
-void
-close_connection (client_connection *connection)
-{
-  close (connection->sock);
-  free_connection (connection);
-}
-
-
-/* Return the connection for SOCK.  */
-client_connection *
-find_connection (int sock)
-{
-  client_connection *connection;
-
-  for (connection = connection_list; connection;
-       connection = connection->next)
-    {
-      if (connection->sock == sock)
-	return connection;
-    }
-
-  return NULL;
-}
-
-
-static client_connection *
-alloc_connection (void)
-{
-  client_connection *connection;
-  size_t read_bufsize = 1024;
-  size_t write_bufsize = 1024;
-
-  connection = (client_connection *)malloc (sizeof (client_connection));
-  if (connection == NULL)
-    return NULL;
-
-  memset (connection, 0, sizeof (client_connection));
-
-  /* Allocate read buffer.  */
-  connection->read_base = malloc (read_bufsize);
-  connection->read_ptr = connection->read_base;
-  connection->read_end = connection->read_base + read_bufsize;
-  if (connection->read_base == NULL)
-    {
-      free (connection);
-      return NULL;
-    }
-
-  /* Allocate write buffer.  */
-  connection->write_base = malloc (write_bufsize);
-  connection->write_ptr = connection->write_base;
-  connection->write_end = connection->write_base + write_bufsize;
-  if (connection->write_base == NULL)
-    {
-      free (connection->read_base);
-      free (connection);
-      return NULL;
-    }
-
-  /* Link connection.  */
-  connection->next = connection_list;
-  connection_list = connection;
-  if (connection->next)
-    connection->next->prev = connection;
-  
-  return connection;
-}
-
-
-static void
-free_connection (client_connection *connection)
-{
-  /* Unlink connection.  */
-  if (connection->next)
-    connection->next->prev = connection->prev;
-  if (connection->prev)
-    connection->prev->next = connection->next;
-
-  /* Take care of the head of the list.  */
-  if (connection == connection_list)
-    connection_list = connection->next;
-  
-  /* Free buffers.  */
-  if (connection->read_base)
-    free (connection->read_base);
-  if (connection->write_base)
-    free (connection->write_base);
-
-  free (connection);
-}
-
-
-/* Set the `O_NONBLOCK' flag of DESC if VALUE is nonzero,
-   or clear the flag if VALUE is 0.
-   Return 0 on success, or -1 on error with `errno' set. */
-static int
-set_nonblock_flag (int desc, int value)
-{
-  int oldflags = fcntl (desc, F_GETFL, 0);
-  /* If reading the flags failed, return error indication now. */
-  if (oldflags == -1)
-    return -1;
-  /* Set just the flag we want to set. */
-  if (value != 0)
-    oldflags |= O_NONBLOCK;
-  else
-    oldflags &= ~O_NONBLOCK;
-  /* Store modified flag word in the descriptor. */
-  return fcntl (desc, F_SETFL, oldflags);
-}
diff --git a/login/programs/database.c b/login/programs/database.c
deleted file mode 100644
index 4267c11186..0000000000
--- a/login/programs/database.c
+++ /dev/null
@@ -1,543 +0,0 @@
-/* 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 <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <unistd.h>
-#include <utmp.h>
-#include <libintl.h>
-
-
-#include "utmpd-private.h"
-#include "xtmp.h"
-
-
-/* Prototypes for the local functions.  */
-static int initialize_database (utmp_database *database);
-static int store_state_entry (utmp_database *database, int old_position,
-			      const struct utmp *old_entry);
-static int store_process_entry (utmp_database *database, int old_position,
-				const struct utmp *old_entry);
-static int replace_entry (utmp_database *database, int old_position,
-			  int new_position, const struct utmp *entry);
-static int store_entry (utmp_database *database, int position,
-			const struct utmp *entry);
-static int get_mtime (int filedes, time_t *timer);
-
-
-/* Open the database specified by FILE and merge it with the contents
-   of the old format file specified by OLD_FILE.  Returns a pointer to
-   a newly allocated structure describing the database, or NULL on
-   error.  */
-utmp_database *
-open_database (const char *file, const char *old_file)
-{
-  mode_t mode =  S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH;
-  utmp_database *database;
-
-  /* Allocate memory.  */
-  database = (utmp_database *) malloc (sizeof (utmp_database));
-  if (database == NULL)
-    {
-      error (0, 0, _("memory exhausted"));
-      return NULL;
-    }
-
-  memset (database, 0, sizeof (utmp_database));
-
-  /* Open database, create it if it doesn't exist already.  */
-  database->fd = open (file, O_RDWR | O_CREAT, mode);
-  if (database->fd < 0)
-    {
-      error (0, errno, "%s", file);
-      goto return_error;
-    }
-
-  database->file = strdup (file);
-  if (database->file == NULL)
-    {
-      error (0, 0, _("memory exhausted"));
-      goto return_error;
-    }
-
-  if (old_file)
-    {
-      database->old_fd = open (old_file, O_RDWR|O_CREAT, mode);
-      if (database->old_fd < 0)
-	{
-	  error (0, errno, "%s", old_file);
-	  goto return_error;
-	}
-
-      database->old_file = strdup (old_file);
-      if (database->old_file == NULL)
-	{
-	  error (0, 0, _("memory exhausted"));
-	  goto return_error;
-	}
-    }
-
-  /* Initialize database.  */
-  if (initialize_database (database) < 0)
-    goto return_error;
-
-  return database;
-
-return_error:
-  close_database (database);
-
-  return NULL;
-}
-
-/* Synchronize DATABASE.  */
-int
-synchronize_database (utmp_database *database)
-{
-  assert (database);
-
-  /* Check if there is a file in the old format, that we have to
-     synchronize with.  */
-  if (database->old_file)
-    {
-      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;
-	  struct utmp entry;
-	  struct utmp old_entry;
-
-	  while (1)
-	    {
-	      if (read_old_entry (database, position, &old_entry) < 0)
-		break;
-
-	      if (read_entry (database, position, &entry) < 0
-		  || !compare_entry (&old_entry, &entry))
-		{
-		  if (write_entry (database, position, &old_entry) < 0)
-		    {
-		      error (0, errno, "%s", database->file);
-		      return -1;
-		    }
-		}
-
-	      position++;
-	    }
-
-	  database->mtime = curtime;
-	}
-
-    }
-
-  return 0;
-}
-
-
-/* Close DATABASE.  */
-void
-close_database (utmp_database *database)
-{
-  assert (database);
-
-  if (database->fd >= 0)
-    close (database->fd);
-
-  if (database->old_fd >= 0)
-    close (database->old_fd);
-
-  /* Free allocated memory.  */
-  if (database->file)
-    free (database->file);
-  if (database->old_file)
-    free (database->old_file);
-  free (database);
-}
-
-
-/* Read the entry at POSITION in DATABASE and store the result in
-   ENTRY.  Returns 0 if successful, -1 if not.  */
-int
-read_entry (utmp_database *database, int position, struct utmp *entry)
-{
-  ssize_t nbytes;
-  off_t offset;
-
-  offset = position * sizeof (struct utmp);
-  if (lseek (database->fd, offset, SEEK_SET) < 0)
-    return -1;
-
-  nbytes = read (database->fd, entry, sizeof (struct utmp));
-  if (nbytes != sizeof (struct utmp))
-    return -1;
-
-  return 0;
-}
-
-
-/* Write ENTRY at POSITION in DATABASE.  Returns 0 if successful, -1
-   on error.  */
-int
-write_entry (utmp_database *database, int position,
-	     const struct utmp *entry)
-{
-  int result = -1;
-  struct flock fl;
-  ssize_t nbytes;
-  off_t offset;
-
-  /* Try to lock the file.  */
-  memset (&fl, 0, sizeof (struct flock));
-  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;
-
-  nbytes = write (database->fd, entry, sizeof (struct utmp));
-  if (nbytes != sizeof (struct utmp))
-    {
-      ftruncate (database->fd, offset);
-      goto fail;
-    }
-
-  result = 0;
-
-fail:
-  /* And unlock the file.  */
-  fl.l_type = F_UNLCK;
-  fcntl (database->fd, F_SETLKW, &fl);
-
-  return result;
-}
-
-
-/* Append ENTRY to DATABASE.  Returns the position of the appended
-   entry if successful, or -1 on error.  */
-int
-append_entry (utmp_database *database, const struct utmp *entry)
-{
-  int result = -1;
-  struct flock fl;
-  ssize_t nbytes;
-  off_t offset;
-
-  /* Try to lock the file.  */
-  memset (&fl, 0, sizeof (struct flock));
-  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)
-    {
-      offset -= offset % sizeof (struct utmp);
-      ftruncate (database->fd, offset);
-
-      if (lseek (database->fd, 0, SEEK_END) < 0)
-	goto fail;
-    }
-
-  nbytes = write (database->fd, entry, sizeof (struct utmp));
-  if (nbytes != sizeof (struct utmp))
-    {
-      ftruncate (database->fd, offset);
-      goto fail;
-    }
-
-  result = offset / sizeof (struct utmp);
-
-fail:
-  /* And unlock the file.  */
-  fl.l_type = F_UNLCK;
-  fcntl (database->fd, F_SETLKW, &fl);
-
-  return result;
-}
-
-
-int
-read_old_entry (utmp_database *database, int position,
-		struct utmp *entry)
-{
-  struct xtmp old_entry;
-  ssize_t nbytes;
-  off_t offset;
-
-  offset = position * sizeof (struct xtmp);
-  if (lseek (database->old_fd, offset, SEEK_SET) < 0)
-    return -1;
-
-  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;
-}
-
-
-int
-write_old_entry (utmp_database *database, int position,
-		 const struct utmp *entry)
-{
-  struct xtmp old_entry;
-  ssize_t nbytes;
-  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;
-
-  nbytes = write (database->old_fd, &old_entry, sizeof (struct xtmp));
-  if (nbytes != sizeof (struct xtmp))
-    return -1;
-
-  return 0;
-}
-
-
-/* Initialize DATABASE.  */
-static int
-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.  */
-  if (database->old_file)
-    {
-      while (1)
-	{
-	  if (read_old_entry (database, position, &entry) < 0)
-	    break;
-
-#if _HAVE_UT_TYPE - 0
-	  /* If the login type is one of RUN_LVL, BOOT_TIME, OLD_TIME or
-	     NEW_TIME, search for an entry of the same type in the
-	     database, and replace it if the entry in the file is newer.  */
-	  if (entry.ut_type == RUN_LVL || entry.ut_type == BOOT_TIME
-	      || entry.ut_type == OLD_TIME || entry.ut_type == NEW_TIME)
-	    {
-	      if (store_state_entry (database, position, &entry) < 0)
-		{
-		  error (0, errno, "%s", database->file);
-		  return -1;
-		}
-	    }
-	  else
-#endif
-	    {
-	      if (store_process_entry (database, position, &entry) < 0)
-		{
-		  error (0, errno, "%s", database->file);
-		  return -1;
-		}
-	    }
-
-	  /* Update position.  */
-	  position++;
-	}
-
-      while (1)
-	{
-	  if (read_entry (database, position, &entry) < 0)
-	    break;
-
-	  if (write_old_entry (database, position, &entry) < 0)
-	    {
-	      error (0, errno, "%s", database->file);
-	      return -1;
-	    }
-
-	  /* Update position.  */
-	  position++;
-	}
-    }
-
-  return synchronize_database (database);
-}
-
-
-#if _HAVE_UT_TYPE - 0
-static int
-store_state_entry (utmp_database *database, int old_position,
-		   const struct utmp *old_entry)
-{
-  struct utmp new_entry;
-  int new_position = 0;
-  int found = 0;
-
-  assert (old_entry->ut_type == RUN_LVL
-	  || old_entry->ut_type == BOOT_TIME
-	  || old_entry->ut_type == OLD_TIME
-	  || old_entry->ut_type == NEW_TIME);
-
-  while (!found)
-    {
-      /* 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;
-	  continue;
-	}
-
-      /* Update position.  */
-      new_position++;
-    }
-
-  if (found)
-    {
-      const struct utmp *entry;
-
-      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
-store_process_entry (utmp_database *database, int old_position,
-		     const struct utmp *old_entry)
-{
-  struct utmp new_entry;
-  int new_position = 0;
-  int found = 0;
-
-  while (!found)
-    {
-      /* Read the next entry.  */
-      if (read_entry (database, new_position, &new_entry) < 0)
-	break;
-
-      if (proc_utmp_eq (old_entry, &new_entry))
-	{
-	  found = 1;
-	  continue;
-	}
-
-      /* Update position.  */
-      new_position++;
-    }
-
-  if (found)
-    {
-      const struct utmp *entry;
-
-      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);
-}
-
-
-static int
-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)
-    return -1;
-
-  return 0;
-}
-
-
-static int
-store_entry (utmp_database *database, int position,
-	     const struct utmp *entry)
-{
-  struct utmp tmp;
-
-  if (read_entry (database, position, &tmp) < 0)
-    return write_entry (database, position, entry);
-
-  if (write_entry (database, position, entry) < 0
-      || append_entry (database, &tmp) < 0)
-    return -1;
-
-  return 0;
-}
-
-
-/* Get modification time of the file with file descriptor FILEDES and
-   put it in TIMER.  Returns 0 if successful, -1 if not.  */
-static int
-get_mtime (int filedes, time_t *timer)
-{
-  struct stat st;
-
-  if (fstat (filedes, &st) < 0)
-    return -1;
-
-  *timer = st.st_mtime;
-
-  return 0;
-}
diff --git a/login/programs/error.c b/login/programs/error.c
deleted file mode 100644
index e6511442e3..0000000000
--- a/login/programs/error.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 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 <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.