summary refs log tree commit diff
path: root/sunrpc
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-03-06 00:26:34 +0000
committerUlrich Drepper <drepper@redhat.com>2005-03-06 00:26:34 +0000
commit93aed66714e2cadb4847162d626c7823e37230d3 (patch)
treef67b21d7e3f6fd22cc712d147d937f1a41bd3e70 /sunrpc
parent171129215cd04bf3e5986c7b1f762a018d5c80e0 (diff)
downloadglibc-93aed66714e2cadb4847162d626c7823e37230d3.tar.gz
glibc-93aed66714e2cadb4847162d626c7823e37230d3.tar.xz
glibc-93aed66714e2cadb4847162d626c7823e37230d3.zip
* sunrpc/key_call.c: Remove doors support.
	* sunrpc/Makefile: Remove CPPFLAGS-key_call.c definition.
	* configure.in: Remove test for doors support which never existed.
	* config.make.in: Remove have_doors entry.

	* configure.in: Make sure at least gcc 3.4 is used.  Undo last change.
	* config.make.in: Undo last change.

	* sysdeps/i386/Makefile ((CFLAGS-initfini.s): Unconditionally use
	-mtune.

	* sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define
	unconditionally to (defined RTLD_BOOTSTRAP).
	* sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Likewise.

2005-03-05  Jakub Jelinek  <jakub@redhat.com>
Diffstat (limited to 'sunrpc')
-rw-r--r--sunrpc/Makefile5
-rw-r--r--sunrpc/key_call.c83
2 files changed, 1 insertions, 87 deletions
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index 2a3a22496e..4a2c60eab4 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1994-2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1994-2004, 2005 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -126,9 +126,6 @@ CFLAGS-pmap_rmt.c = -fexceptions
 CFLAGS-clnt_perr.c = -fexceptions
 CFLAGS-openchild.c = -fexceptions
 
-ifeq (yes,$(have_doors))
-CPPFLAGS-key_call.c += -DHAVE_DOORS=1
-endif
 CPPFLAGS += -D_RPC_THREAD_SAFE_
 
 include ../Rules
diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c
index 506a99767c..77c0ce18b9 100644
--- a/sunrpc/key_call.c
+++ b/sunrpc/key_call.c
@@ -51,10 +51,6 @@
 #include <rpc/key_prot.h>
 #include <bits/libc-lock.h>
 
-#ifdef HAVE_DOORS
-# include "door/door.h"
-#endif
-
 #define KEY_TIMEOUT	5	/* per-try timeout in seconds */
 #define KEY_NRETRY	12	/* number of retries */
 
@@ -503,73 +499,6 @@ key_call_socket (u_long proc, xdrproc_t xdr_arg, char *arg,
   return result;
 }
 
-#ifdef HAVE_DOORS
-/* returns 0 on failure, 1 on success */
-static int
-internal_function
-key_call_door (u_long proc, xdrproc_t xdr_arg, char *arg,
-	       xdrproc_t xdr_rslt, char *rslt)
-{
-  XDR xdrs;
-  int fd, ret;
-  door_arg_t args;
-  char *data_ptr;
-  u_long data_len = 0;
-  char res[255];
-
-  if ((fd = open("/var/run/keyservdoor", O_RDONLY)) < 0)
-    return 0;
-  res[0] = 0;
-
-  data_len = xdr_sizeof (xdr_arg, arg);
-  data_ptr = calloc (1, data_len + 2 * sizeof (u_long));
-  if (data_ptr == NULL)
-    return 0;
-
-  INTUSE(xdrmem_create) (&xdrs, &data_ptr[2 * sizeof (u_long)], data_len,
-			 XDR_ENCODE);
-  if (!xdr_arg (&xdrs, arg))
-    {
-      xdr_destroy (&xdrs);
-      free (data_ptr);
-      return 0;
-    }
-  xdr_destroy (&xdrs);
-
-  memcpy (data_ptr, &proc, sizeof (u_long));
-  memcpy (&data_ptr[sizeof (proc)], &data_len, sizeof (u_long));
-
-  args.data_ptr = data_ptr;
-  args.data_size = data_len + 2 * sizeof (u_long);
-  args.desc_ptr = NULL;
-  args.desc_num = 0;
-  args.rbuf = res;
-  args.rsize = sizeof (res);
-
-  ret = __door_call (fd, &args);
-  free (data_ptr);
-  close (fd);
-
-  if (ret < 0)
-    return 0;
-
-  memcpy (&data_len, args.data_ptr, sizeof (u_long));
-  if (data_len != 0)
-    return 0;
-
-  memcpy (&data_len, &args.data_ptr[sizeof (u_long)], sizeof (u_long));
-  INTUSE(xdrmem_create) (&xdrs, &args.data_ptr[2 * sizeof (u_long)],
-			 data_len, XDR_DECODE);
-  if (!xdr_rslt (&xdrs, rslt))
-    {
-      xdr_destroy (&xdrs);
-      return 0;
-    }
-  xdr_destroy (&xdrs);
-
-  return 1;
-}
-#endif
 
 /* returns 0 on failure, 1 on success */
 static int
@@ -580,9 +509,6 @@ key_call (u_long proc, xdrproc_t xdr_arg, char *arg,
 #ifndef SO_PASSCRED
   static int use_keyenvoy;
 #endif
-#ifdef HAVE_DOORS
-  static int not_use_doors;
-#endif
 
   if (proc == KEY_ENCRYPT_PK && __key_encryptsession_pk_LOCAL)
     {
@@ -606,15 +532,6 @@ key_call (u_long proc, xdrproc_t xdr_arg, char *arg,
       return 1;
     }
 
-#ifdef HAVE_DOORS
-  if (!not_use_doors)
-    {
-      if (key_call_door (proc, xdr_arg, arg, xdr_rslt, rslt))
-	return 1;
-      not_use_doors = 1;
-    }
-#endif
-
 #ifdef SO_PASSCRED
   return key_call_socket (proc, xdr_arg, arg, xdr_rslt, rslt);
 #else