Update.

1999-11-13  Thorsten Kukuk  <kukuk@suse.de>

	* sysdeps/unix/sysv/linux/sparc/bits/signum.h: Add SIGPWR define
	from current kernel headers.

	* sunrpc/key_call.c: Use /usr/etc/keyenvoy only if we don't have
	SO_PASSCRED defined.

diff --git a/ChangeLog b/ChangeLog
index 56a29840a5df0e1df942ee785fe4b4e77cfee7e5..15944ea5138a6115213fd9da1a9227746ef72c14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-11-13  Thorsten Kukuk  <kukuk@suse.de>
+
+       * sysdeps/unix/sysv/linux/sparc/bits/signum.h: Add SIGPWR define
+       from current kernel headers.
+
+       * sunrpc/key_call.c: Use /usr/etc/keyenvoy only if we don't have
+       SO_PASSCRED defined.
+
 1999-11-12  Ulrich Drepper  <drepper@cygnus.com>
 
        * locale/C-ctype.c: Fix typo in char class name.

diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c
index 2f4ca25d945aecd5b2b8aa5ecda1e0d4d4ef08a1..895e5a3a4d7179ed640524a7cf0b74b8203b5966 100644 (file)
--- a/sunrpc/key_call.c
+++ b/sunrpc/key_call.c
@@ -1,6 +1,3 @@
-/*
- * Copyright (c) 1988 by Sun Microsystems, Inc.
- */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -29,11 +26,15 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-
+/*
+ * Copyright (c) 1988 by Sun Microsystems, Inc.
+ */
 /*
  * The original source is from the RPCSRC 4.0 package from Sun Microsystems.
- * The Interface to keyserver protocoll 2, RPC over AF_UNIX und Linux/doors
- * was added by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
+ * The Interface to keyserver protocoll 2, RPC over AF_UNIX and Linux/doors
+ * was added by Thorsten Kukuk <kukuk@suse.de>
+ * Since the Linux/doors project was stopped, I doubt that this code will
+ * ever be useful <kukuk@suse.de>.
  */
 
 #include <stdio.h>
@@ -59,8 +60,9 @@
 
 #define debug(msg)             /* turn off debugging */
 
+#ifndef SO_PASSCRED
 extern int _openchild (const char *command, FILE **fto, FILE **ffrom);
-
+#endif
 
 static int key_call (u_long, xdrproc_t xdr_arg, char *,
                     xdrproc_t xdr_rslt, char *) internal_function;
@@ -272,6 +274,7 @@ cryptkeyres *(*__key_encryptsession_pk_LOCAL) (uid_t, char *);
 cryptkeyres *(*__key_decryptsession_pk_LOCAL) (uid_t, char *);
 des_block *(*__key_gendes_LOCAL) (uid_t, char *);
 
+#ifndef SO_PASSCRED
 static int
 internal_function
 key_call_keyenvoy (u_long proc, xdrproc_t xdr_arg, char *arg,
@@ -349,6 +352,7 @@ key_call_keyenvoy (u_long proc, xdrproc_t xdr_arg, char *arg,
 
   return success;
 }
+#endif
 
 struct  key_call_private {
   CLIENT  *client;        /* Client handle */
@@ -556,7 +560,9 @@ internal_function
 key_call (u_long proc, xdrproc_t xdr_arg, char *arg,
          xdrproc_t xdr_rslt, char *rslt)
 {
+#ifndef SO_PASSCRED
   static int use_keyenvoy;
+#endif
 #ifdef HAVE_DOORS
   static int not_use_doors;
 #endif
@@ -591,6 +597,10 @@ key_call (u_long proc, xdrproc_t xdr_arg, char *arg,
       not_use_doors = 1;
     }
 #endif
+
+#ifdef SO_PASSCRED
+  return key_call_socket (proc, xdr_arg, arg, xdr_rslt, rslt);
+#else
   if (!use_keyenvoy)
     {
       if (key_call_socket (proc, xdr_arg, arg, xdr_rslt, rslt))
@@ -598,4 +608,5 @@ key_call (u_long proc, xdrproc_t xdr_arg, char *arg,
       use_keyenvoy = 1;
     }
   return key_call_keyenvoy (proc, xdr_arg, arg, xdr_rslt, rslt);
+#endif
 }

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/signum.h b/sysdeps/unix/sysv/linux/sparc/bits/signum.h
index 976eef275846cd7ea665dc0093407d687f630f8c..31a6901b1a000b8619589a0b064a0039b7249f34 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/signum.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/signum.h
@@ -65,6 +65,7 @@
 #define SIGPROF                27
 #define SIGWINCH       28
 #define SIGLOST                29
+#define SIGPWR          SIGLOST
 #define SIGUSR1                30
 #define SIGUSR2                31