qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ulrich Drepper 1999-11-13 18:04:57 +00:00
parent 78bba25cdf
commit 54f4f73e26
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> 1999-11-12 Ulrich Drepper <drepper@cygnus.com>
* locale/C-ctype.c: Fix typo in char class name. * locale/C-ctype.c: Fix typo in char class name.

25
sunrpc/key_call.c
View File

@ -1,6 +1,3 @@
/*
* Copyright (c) 1988 by Sun Microsystems, Inc.
*/
/* /*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape * unrestricted use provided that this legend is included on all tape
@ -29,11 +26,15 @@
* 2550 Garcia Avenue * 2550 Garcia Avenue
* Mountain View, California 94043 * 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 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 * The Interface to keyserver protocoll 2, RPC over AF_UNIX and Linux/doors
* was added by Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * 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> #include <stdio.h>
@ -59,8 +60,9 @@
#define debug(msg) /* turn off debugging */ #define debug(msg) /* turn off debugging */
#ifndef SO_PASSCRED
extern int _openchild (const char *command, FILE **fto, FILE **ffrom); extern int _openchild (const char *command, FILE **fto, FILE **ffrom);
#endif
static int key_call (u_long, xdrproc_t xdr_arg, char *, static int key_call (u_long, xdrproc_t xdr_arg, char *,
xdrproc_t xdr_rslt, char *) internal_function; 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 *); cryptkeyres *(*__key_decryptsession_pk_LOCAL) (uid_t, char *);
des_block *(*__key_gendes_LOCAL) (uid_t, char *); des_block *(*__key_gendes_LOCAL) (uid_t, char *);
#ifndef SO_PASSCRED
static int static int
internal_function internal_function
key_call_keyenvoy (u_long proc, xdrproc_t xdr_arg, char *arg, 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; return success;
} }
#endif
struct key_call_private { struct key_call_private {
CLIENT *client; /* Client handle */ CLIENT *client; /* Client handle */
@ -556,7 +560,9 @@ internal_function
key_call (u_long proc, xdrproc_t xdr_arg, char *arg, key_call (u_long proc, xdrproc_t xdr_arg, char *arg,
xdrproc_t xdr_rslt, char *rslt) xdrproc_t xdr_rslt, char *rslt)
{ {
#ifndef SO_PASSCRED
static int use_keyenvoy; static int use_keyenvoy;
#endif
#ifdef HAVE_DOORS #ifdef HAVE_DOORS
static int not_use_doors; static int not_use_doors;
#endif #endif
@ -591,6 +597,10 @@ key_call (u_long proc, xdrproc_t xdr_arg, char *arg,
not_use_doors = 1; not_use_doors = 1;
} }
#endif #endif
#ifdef SO_PASSCRED
return key_call_socket (proc, xdr_arg, arg, xdr_rslt, rslt);
#else
if (!use_keyenvoy) if (!use_keyenvoy)
{ {
if (key_call_socket (proc, xdr_arg, arg, xdr_rslt, rslt)) 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; use_keyenvoy = 1;
} }
return key_call_keyenvoy (proc, xdr_arg, arg, xdr_rslt, rslt); return key_call_keyenvoy (proc, xdr_arg, arg, xdr_rslt, rslt);
#endif
} }

1
sysdeps/unix/sysv/linux/sparc/bits/signum.h
View File

@ -65,6 +65,7 @@
#define SIGPROF 27 #define SIGPROF 27
#define SIGWINCH 28 #define SIGWINCH 28
#define SIGLOST 29 #define SIGLOST 29
#define SIGPWR SIGLOST
#define SIGUSR1 30 #define SIGUSR1 30
#define SIGUSR2 31 #define SIGUSR2 31