diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-08-28 07:25:21 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-08-28 07:25:21 -0400 |
| commit | 85547073265ae9bc4ae3af920a6d3214fd1ca0c5 (patch) | |
| tree | 2e720a9d55fe3cf65e735c8ce66866fb8c749d18 /os/rpcauth.c | |
| parent | 860a09cfb8afc0a293c7eb5e01762724eb86847a (diff) | |
| parent | 7d54399cfdaa7f54e28828267a76b89c4e8e798f (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
include/miscstruct.h
mi/mibstore.c
mi/midispcur.c
os/Makefile.am
Diffstat (limited to 'os/rpcauth.c')
| -rw-r--r-- | os/rpcauth.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/os/rpcauth.c b/os/rpcauth.c index 603844aee..3451ac18b 100644 --- a/os/rpcauth.c +++ b/os/rpcauth.c @@ -39,7 +39,7 @@ from The Open Group. #ifdef SECURE_RPC #include <X11/X.h> -#include "Xauth.h" +#include <X11/Xauth.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -135,7 +135,7 @@ CheckNetName ( static char rpc_error[MAXNETNAMELEN+50]; -XID +_X_HIDDEN XID SecureRPCCheck (unsigned short data_length, char *data, ClientPtr client, char **reason) { @@ -159,14 +159,14 @@ SecureRPCCheck (unsigned short data_length, char *data, return (XID) ~0L; } -void +_X_HIDDEN void SecureRPCInit (void) { if (rpc_id == ~0L) AddAuthorization (9, "SUN-DES-1", 0, (char *) 0); } -int +_X_HIDDEN int SecureRPCAdd (unsigned short data_length, char *data, XID id) { if (data_length) @@ -175,26 +175,26 @@ SecureRPCAdd (unsigned short data_length, char *data, XID id) return 1; } -int +_X_HIDDEN int SecureRPCReset (void) { rpc_id = (XID) ~0L; return 1; } -XID +_X_HIDDEN XID SecureRPCToID (unsigned short data_length, char *data) { return rpc_id; } -int +_X_HIDDEN int SecureRPCFromID (XID id, unsigned short *data_lenp, char **datap) { return 0; } -int +_X_HIDDEN int SecureRPCRemove (unsigned short data_length, char *data) { return 0; |