diff options
Diffstat (limited to 'sunrpc')
| -rw-r--r-- | sunrpc/auth_unix.c | 12 | ||||
| -rw-r--r-- | sunrpc/rpc/auth.h | 5 | ||||
| -rw-r--r-- | sunrpc/rpc/auth_unix.h | 24 |
3 files changed, 22 insertions, 19 deletions
diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c index f0e6686d65..bb631b4d52 100644 --- a/sunrpc/auth_unix.c +++ b/sunrpc/auth_unix.c @@ -92,10 +92,10 @@ static bool_t marshal_new_auth(); AUTH * authunix_create(machname, uid, gid, len, aup_gids) char *machname; - int uid; - int gid; + uid_t uid; + gid_t gid; register int len; - int *aup_gids; + gid_t *aup_gids; { struct authunix_parms aup; char mymem[MAX_AUTH_BYTES]; @@ -172,8 +172,8 @@ authunix_create_default() { register int len; char machname[MAX_MACHINE_NAME + 1]; - register int uid; - register int gid; + register uid_t uid; + register gid_t gid; int max_nr_groups = sysconf (_SC_NGROUPS_MAX); gid_t gids[max_nr_groups]; @@ -260,7 +260,7 @@ authunix_refresh(auth) /* first deserialize the creds back into a struct authunix_parms */ aup.aup_machname = NULL; - aup.aup_gids = (int *)NULL; + aup.aup_gids = (gid_t *)NULL; xdrmem_create(&xdrs, au->au_origcred.oa_base, au->au_origcred.oa_length, XDR_DECODE); stat = xdr_authunix_parms(&xdrs, &aup); diff --git a/sunrpc/rpc/auth.h b/sunrpc/rpc/auth.h index 39aa0f7bcb..fff60baccd 100644 --- a/sunrpc/rpc/auth.h +++ b/sunrpc/rpc/auth.h @@ -155,8 +155,9 @@ extern struct opaque_auth _null_auth; * int len; * int *aup_gids; */ -extern AUTH *authunix_create __P ((char *__machname, int __uid, int __gid, - int __len, int *__aup_gids)); +extern AUTH *authunix_create __P ((char *__machname, __uid_t __uid, + __gid_t __gid, int __len, + __gid_t *__aup_gids)); extern AUTH *authunix_create_default __P ((void)); extern AUTH *authnone_create __P ((void)); extern AUTH *authdes_create(); diff --git a/sunrpc/rpc/auth_unix.h b/sunrpc/rpc/auth_unix.h index 3fb711894e..32d8d0aa35 100644 --- a/sunrpc/rpc/auth_unix.h +++ b/sunrpc/rpc/auth_unix.h @@ -58,14 +58,15 @@ __BEGIN_DECLS /* * Unix style credentials. */ -struct authunix_parms { - u_long aup_time; - char *aup_machname; - int aup_uid; - int aup_gid; - u_int aup_len; - int *aup_gids; -}; +struct authunix_parms + { + u_long aup_time; + char *aup_machname; + __uid_t aup_uid; + __gid_t aup_gid; + u_int aup_len; + __gid_t *aup_gids; + }; extern bool_t xdr_authunix_parms __P ((XDR *__xdrs, struct authunix_parms *__p)); @@ -75,9 +76,10 @@ extern bool_t xdr_authunix_parms __P ((XDR *__xdrs, * then the body of the response verifier encapsulates the following structure; * again it is serialized in the obvious fashion. */ -struct short_hand_verf { - struct opaque_auth new_cred; -}; +struct short_hand_verf + { + struct opaque_auth new_cred; + }; __END_DECLS |