From 827396ba31e3e368e9d86d33c839358087f09aa7 Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Thu, 27 Sep 2012 20:06:37 +0000 Subject: [PATCH] Complete revert of r239963: The attempt to merge changes from the linux libtirpc caused rpc.lockd to exit after startup under unclear conditions. After many hours of selective experiments and inconsistent results the conclusion is that it's better to just revert everything and restart in a future time with a much smaller subset of the changes. ____ MFC after: 3 days Reported by: David Wolfskill Tested by: David Wolfskill --- include/rpc/auth.h | 9 +++++---- include/rpc/auth_unix.h | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/rpc/auth.h b/include/rpc/auth.h index 5833c02e429..d39ad120537 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -243,13 +243,14 @@ __END_DECLS * System style authentication * AUTH *authunix_create(machname, uid, gid, len, aup_gids) * char *machname; - * uid_t uid; - * gid_t gid; + * int uid; + * int gid; * int len; - * gid_t *aup_gids; + * int *aup_gids; */ __BEGIN_DECLS -extern AUTH *authunix_create(char *, uid_t, gid_t, int, gid_t *); +extern AUTH *authunix_create(char *, int, int, int, + 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 08e156900db..48373b2c24c 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; + int aup_uid; + int aup_gid; u_int aup_len; - gid_t *aup_gids; + int *aup_gids; }; #define authsys_parms authunix_parms