diff options
| author | pfg <pfg@FreeBSD.org> | 2012-09-27 20:06:37 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2012-09-27 20:06:37 +0000 |
| commit | 2971b4a1848640e101b8f4080426f14ec481a081 (patch) | |
| tree | 7ab7b420a0f1d99279f97dc59256abe94a49c349 /include | |
| parent | 17db4cd864106dba20aafa24d8c6717ec0aa080e (diff) | |
| download | FreeBSD-src-2971b4a1848640e101b8f4080426f14ec481a081.zip FreeBSD-src-2971b4a1848640e101b8f4080426f14ec481a081.tar.gz | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/rpc/auth.h | 9 | ||||
| -rw-r--r-- | 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 5833c02..d39ad12 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 08e1569..48373b2 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 |
