Converted all uid and gid variables of the type uid_t and gid_t.

Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/src/auth_unix.c b/src/auth_unix.c
index c2727e069fb70673607d7b1a2525c488cdcf7f7a..04ee5dde772410f8c60cd80b40302703226e00cd 100644 (file)
--- a/src/auth_unix.c
+++ b/src/auth_unix.c
@@ -84,10 +84,10 @@ struct audata {
 AUTH *
 authunix_create(machname, uid, gid, len, aup_gids)
        char *machname;
-       int uid;
-       int gid;
+       uid_t uid;
+       gid_t gid;
        int len;
-       int *aup_gids;
+       gid_t *aup_gids;
 {
        struct authunix_parms aup;
        char mymem[MAX_AUTH_BYTES];
@@ -189,8 +189,7 @@ authunix_create_default()
        if ((len = getgroups(NGRPS, gids)) < 0)
                abort();
        /* XXX: interface problem; those should all have been unsigned */
-       return (authunix_create(machname, (int)uid, (int)gid, len,
-           (int *)gids));
+       return (authunix_create(machname, uid, gid, len, gids));
 }
 
 /*

diff --git a/src/authunix_prot.c b/src/authunix_prot.c
index 01c17116c1426aaf785c141c7058b63df5ee4a95..79f2fb6e5ffcb01549c9e8d5acf420fc71eced16 100644 (file)
--- a/src/authunix_prot.c
+++ b/src/authunix_prot.c
@@ -57,8 +57,8 @@ xdr_authunix_parms(xdrs, p)
 
        if (xdr_u_long(xdrs, &(p->aup_time))
            && xdr_string(xdrs, &(p->aup_machname), MAX_MACHINE_NAME)
-           && xdr_int(xdrs, &(p->aup_uid))
-           && xdr_int(xdrs, &(p->aup_gid))
+           && xdr_u_int(xdrs, &(p->aup_uid))
+           && xdr_u_int(xdrs, &(p->aup_gid))
            && xdr_array(xdrs, (caddr_t *)&(p->aup_gids),
                    &(p->aup_len), NGRPS, sizeof(int), (xdrproc_t)xdr_int) ) {
                return (TRUE);

diff --git a/src/svc_auth_unix.c b/src/svc_auth_unix.c
index 77a127212b6d9e8d3579d5751c85a17d8f2d362c..7a7eeaa7d378508262ab16b0acd60abdb044493c 100644 (file)
--- a/src/svc_auth_unix.c
+++ b/src/svc_auth_unix.c
@@ -59,7 +59,7 @@ _svcauth_unix(rqst, msg)
        struct area {
                struct authunix_parms area_aup;
                char area_machname[MAX_MACHINE_NAME+1];
-               int area_gids[NGRPS];
+               gid_t area_gids[NGRPS];
        } *area;
        u_int auth_len;
        size_t str_len, gid_len;

diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h
index c6c418c8dcf44e16def1b848222b4e0495deb8e2..532a8cbd21c3bac2bc1aea6b7de033535d4f5ad2 100644 (file)
--- a/tirpc/rpc/auth.h
+++ b/tirpc/rpc/auth.h
@@ -279,8 +279,7 @@ int authany_wrap(void), authany_unwrap(void);
  *     int *aup_gids;
  */
 __BEGIN_DECLS
-extern AUTH *authunix_create(char *, int, int, int,
-    int *);
+extern AUTH *authunix_create(char *, uid_t, uid_t, int, uid_t *);
 extern AUTH *authunix_create_default(void);    /* takes no parameters */
 extern AUTH *authnone_create(void);            /* takes no parameters */
 __END_DECLS

diff --git a/tirpc/rpc/auth_unix.h b/tirpc/rpc/auth_unix.h
index 41f0f44fef0b3d2fcc3fdb6f39060229e137d6ec..0839fb318db4c4e4f99a0fbbfc554fffb66238c1 100644 (file)
--- a/tirpc/rpc/auth_unix.h
+++ b/tirpc/rpc/auth_unix.h
@@ -60,10 +60,10 @@
 struct authunix_parms {
        u_long   aup_time;
        char    *aup_machname;
-       int      aup_uid;
-       int      aup_gid;
+       uid_t    aup_uid;
+       gid_t    aup_gid;
        u_int    aup_len;
-       int     *aup_gids;
+       gid_t   *aup_gids;
 };
 
 #define authsys_parms authunix_parms