diff options
| author | pfg <pfg@FreeBSD.org> | 2012-09-27 19:10:25 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2012-09-27 19:10:25 +0000 |
| commit | 17db4cd864106dba20aafa24d8c6717ec0aa080e (patch) | |
| tree | b0021cc6cf8711340229a2a7f6fc07dfc953a425 /sys/rpc | |
| parent | 8f394b36947fe1d8e82fef172f40b2901063475d (diff) | |
| download | FreeBSD-src-17db4cd864106dba20aafa24d8c6717ec0aa080e.zip FreeBSD-src-17db4cd864106dba20aafa24d8c6717ec0aa080e.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 'sys/rpc')
| -rw-r--r-- | sys/rpc/auth.h | 9 | ||||
| -rw-r--r-- | sys/rpc/rpcb_clnt.c | 7 |
2 files changed, 5 insertions, 11 deletions
diff --git a/sys/rpc/auth.h b/sys/rpc/auth.h index 5ec8541..6be08b6 100644 --- a/sys/rpc/auth.h +++ b/sys/rpc/auth.h @@ -234,17 +234,18 @@ __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 #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 *, int, int, int, + int *); extern AUTH *authunix_create_default(void); /* takes no parameters */ #endif extern AUTH *authnone_create(void); /* takes no parameters */ diff --git a/sys/rpc/rpcb_clnt.c b/sys/rpc/rpcb_clnt.c index 4106dfd..d484df3 100644 --- a/sys/rpc/rpcb_clnt.c +++ b/sys/rpc/rpcb_clnt.c @@ -780,13 +780,6 @@ __rpcb_findaddr_timed(program, version, nconf, host, clpp, tp) } parms.r_addr = NULL; - parms.r_netid = nconf->nc_netid; - - /* - * According to wire captures, the reference implementation - * (OpenSolaris) sends a blank string here too. - */ - parms.r_owner = ""; /* * Use default total timeout if no timeout is specified. |
