From 322c7845daaf5e5e0b96fabc9be3aef6573373db Mon Sep 17 00:00:00 2001 From: pfg Date: Thu, 4 Oct 2012 04:15:18 +0000 Subject: rpc: convert all uid and gid variables to u_int. After further discussion, instead of pretending to use uid_t and gid_t as upstream Solaris and linux try to, we are better using u_int, which is in fact what the code can handle and best approaches the range of values used by uid and gid. Discussed with: bde Reviewed by: bde --- include/rpc/auth.h | 8 ++++---- include/rpc/auth_unix.h | 6 +++--- lib/libc/rpc/auth_unix.c | 7 ++++--- lib/libc/rpc/authunix_prot.c | 4 ++-- lib/libc/rpc/rpc_soc.3 | 2 +- lib/libc/rpc/svc_auth_unix.c | 2 +- sys/rpc/auth.h | 8 ++++---- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/include/rpc/auth.h b/include/rpc/auth.h index 5833c02..b19addc 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -243,13 +243,13 @@ __END_DECLS * System style authentication * AUTH *authunix_create(machname, uid, gid, len, aup_gids) * char *machname; - * uid_t uid; - * gid_t gid; + * u_int uid; + * u_int gid; * int len; - * gid_t *aup_gids; + * u_int *aup_gids; */ __BEGIN_DECLS -extern AUTH *authunix_create(char *, uid_t, gid_t, int, gid_t *); +extern AUTH *authunix_create(char *, u_int, u_int, int, u_int *); extern AUTH *authunix_create_default(void); /* takes no parameters */ extern AUTH *authnone_create(void); /* takes no parameters */ __END_DECLS diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h index 08e1569..b005bac 100644 --- a/include/rpc/auth_unix.h +++ b/include/rpc/auth_unix.h @@ -60,10 +60,10 @@ struct authunix_parms { u_long aup_time; char *aup_machname; - uid_t aup_uid; - gid_t aup_gid; + u_int aup_uid; + u_int aup_gid; u_int aup_len; - gid_t *aup_gids; + u_int *aup_gids; }; #define authsys_parms authunix_parms diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c index 4d7a89b..5c138d0 100644 --- a/lib/libc/rpc/auth_unix.c +++ b/lib/libc/rpc/auth_unix.c @@ -94,10 +94,10 @@ struct audata { AUTH * authunix_create(machname, uid, gid, len, aup_gids) char *machname; - uid_t uid; - gid_t gid; + u_int uid; + u_int gid; int len; - gid_t *aup_gids; + u_int *aup_gids; { struct authunix_parms aup; char mymem[MAX_AUTH_BYTES]; @@ -207,6 +207,7 @@ authunix_create_default() abort(); if (ngids > NGRPS) ngids = NGRPS; + /* XXX: interface problem; we should translate from uid_t and gid_t */ auth = authunix_create(machname, uid, gid, ngids, gids); free(gids); return (auth); diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c index 36311e8..f80b176 100644 --- a/lib/libc/rpc/authunix_prot.c +++ b/lib/libc/rpc/authunix_prot.c @@ -60,7 +60,7 @@ xdr_authunix_parms(xdrs, p) XDR *xdrs; struct authunix_parms *p; { - gid_t **paup_gids; + u_int **paup_gids; assert(xdrs != NULL); assert(p != NULL); @@ -72,7 +72,7 @@ xdr_authunix_parms(xdrs, p) xdr_u_int(xdrs, &(p->aup_uid)) && xdr_u_int(xdrs, &(p->aup_gid)) && xdr_array(xdrs, (char **) paup_gids, - &(p->aup_len), NGRPS, sizeof(gid_t), (xdrproc_t)xdr_int) ) { + &(p->aup_len), NGRPS, sizeof(u_int), (xdrproc_t)xdr_u_int) ) { return (TRUE); } return (FALSE); diff --git a/lib/libc/rpc/rpc_soc.3 b/lib/libc/rpc/rpc_soc.3 index a049a83..1af5728 100644 --- a/lib/libc/rpc/rpc_soc.3 +++ b/lib/libc/rpc/rpc_soc.3 @@ -148,7 +148,7 @@ default authentication used by .Ft "AUTH *" .Xc .It Xo -.Fn authunix_create "char *host" "uid_t uid" "gid_t gid" "int len" "gid_t *aup_gids" +.Fn authunix_create "char *host" "u_int uid" "u_int gid" "int len" "u_int *aup_gids" .Xc .Pp Create and return an diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c index f889d81..20d4ecc 100644 --- a/lib/libc/rpc/svc_auth_unix.c +++ b/lib/libc/rpc/svc_auth_unix.c @@ -68,7 +68,7 @@ _svcauth_unix(rqst, msg) struct area { struct authunix_parms area_aup; char area_machname[MAX_MACHINE_NAME+1]; - gid_t area_gids[NGRPS]; + u_int area_gids[NGRPS]; } *area; u_int auth_len; size_t str_len, gid_len; diff --git a/sys/rpc/auth.h b/sys/rpc/auth.h index 5ec8541..c2814d2 100644 --- a/sys/rpc/auth.h +++ b/sys/rpc/auth.h @@ -234,17 +234,17 @@ __END_DECLS * System style authentication * AUTH *authunix_create(machname, uid, gid, len, aup_gids) * char *machname; - * uid_t uid; - * gid_t gid; + * u_int uid; + * u_int gid; * int len; - * gid_t *aup_gids; + * u_int *aup_gids; */ __BEGIN_DECLS #ifdef _KERNEL struct ucred; extern AUTH *authunix_create(struct ucred *); #else -extern AUTH *authunix_create(char *, uid_t, gid_t, int, gid_t *); +extern AUTH *authunix_create(char *, u_int, u_int, int, u_int *); extern AUTH *authunix_create_default(void); /* takes no parameters */ #endif extern AUTH *authnone_create(void); /* takes no parameters */ -- cgit v1.1