Author: jpaetzel
Date: Sat Sep 26 16:30:16 2015
New Revision: 288272
URL: https://svnweb.freebsd.org/changeset/base/288272
Log:
Increase group limit for kerberized NFSv4
PR: 202659
Submitted by: matthew.l.dai...@dartmouth.edu
Reviewed by: rmacklem dfr
MFC after: 1 week
Sponsored by: iXsystems
Modified:
head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
head/usr.sbin/gssd/gssd.c
Modified: head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
==============================================================================
--- head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c Sat Sep 26 14:52:47 2015
(r288271)
+++ head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c Sat Sep 26 16:30:16 2015
(r288272)
@@ -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_g
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))
Modified: head/usr.sbin/gssd/gssd.c
==============================================================================
--- head/usr.sbin/gssd/gssd.c Sat Sep 26 14:52:47 2015 (r288271)
+++ head/usr.sbin/gssd/gssd.c Sat Sep 26 16:30:16 2015 (r288272)
@@ -751,8 +751,8 @@ gssd_pname_to_uid_1_svc(pname_to_uid_arg
buflen_hint = buflen;
}
if (pw) {
- int len = NGRPS;
- int groups[NGRPS];
+ int len = NGROUPS;
+ int groups[NGROUPS];
result->gid = pw->pw_gid;
getgrouplist(pw->pw_name, pw->pw_gid,
groups, &len);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
