diff options
| author | Renato Botelho <renato@netgate.com> | 2015-10-07 18:07:27 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-10-07 18:07:27 -0300 |
| commit | 945ed01c4bae06169f63978e43029c04d4abd731 (patch) | |
| tree | 5cd3ae372187bd25416aeec230f31242c3729be7 /sys/rpc/rpcsec_gss/svc_rpcsec_gss.c | |
| parent | 8aae621ec1e941b8f27411df1bace42778e61b99 (diff) | |
| parent | 36b47c3278c31b909b37616c58ccf4f148a9e47c (diff) | |
| download | FreeBSD-src-945ed01c4bae06169f63978e43029c04d4abd731.zip FreeBSD-src-945ed01c4bae06169f63978e43029c04d4abd731.tar.gz | |
Merge branch 'stable/10' into devel
Diffstat (limited to 'sys/rpc/rpcsec_gss/svc_rpcsec_gss.c')
| -rw-r--r-- | sys/rpc/rpcsec_gss/svc_rpcsec_gss.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c index 64e691e..b3a920a 100644 --- a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c +++ b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c @@ -121,9 +121,6 @@ enum svc_rpc_gss_client_state { }; #define SVC_RPC_GSS_SEQWINDOW 128 -#ifndef RPCAUTH_UNIXGIDS -#define RPCAUTH_UNIXGIDS 16 -#endif struct svc_rpc_gss_clientid { unsigned long ci_hostid; @@ -150,7 +147,7 @@ struct svc_rpc_gss_client { int cl_rpcflavor; /* RPC pseudo sec flavor */ bool_t cl_done_callback; /* TRUE after call */ void *cl_cookie; /* user cookie from callback */ - gid_t cl_gid_storage[RPCAUTH_UNIXGIDS]; + gid_t cl_gid_storage[NGROUPS]; gss_OID cl_mech; /* mechanism */ gss_qop_t cl_qop; /* quality of protection */ uint32_t cl_seqlast; /* sequence window origin */ @@ -776,7 +773,7 @@ svc_rpc_gss_build_ucred(struct svc_rpc_gss_client *client, uc->gid = 65534; uc->gidlist = client->cl_gid_storage; - numgroups = RPCAUTH_UNIXGIDS; + numgroups = NGROUPS; maj_stat = gss_pname_to_unix_cred(&min_stat, name, client->cl_mech, &uc->uid, &uc->gid, &numgroups, &uc->gidlist[0]); if (GSS_ERROR(maj_stat)) |
