Attachment 144850 Details for Bug 221518 – Upstream patch

[patch] Upstream patch

nfs-utils-1.0.7-pre2-04-svcgssd_get_grouplist.dif (text/plain), 1.76 KB, created by Steve Dickson on 2007-01-04 21:52:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Dickson

Created: 2007-01-04 21:52:48 UTC

Size: 1.76 KB

patch

obsolete

>
>
>---
>
> nfs-utils-1.0.6-bfields/utils/svcgssd/svcgssd_proc.c |   27 +++++++++++++++++--
> 1 files changed, 25 insertions(+), 2 deletions(-)
>
>diff -puN utils/svcgssd/svcgssd_proc.c~svcgssd_get_grouplist utils/svcgssd/svcgssd_proc.c
>--- nfs-utils-1.0.6/utils/svcgssd/svcgssd_proc.c~svcgssd_get_grouplist	2004-11-14 16:23:44.000000000 -0500
>+++ nfs-utils-1.0.6-bfields/utils/svcgssd/svcgssd_proc.c	2004-11-14 17:38:08.000000000 -0500
>@@ -162,6 +162,29 @@ send_response(FILE *f, gss_buffer_desc *
> #define rpcsec_gsserr_credproblem	13
> #define rpcsec_gsserr_ctxproblem	14
> 
>+static void
>+add_supplementary_groups(char *secname, char *name, struct svc_cred *cred)
>+{
>+	int ret;
>+	static gid_t *groups = NULL;
>+
>+	ret = nfs4_gss_princ_to_grouplist(secname, name,
>+			cred->cr_groups, &cred->cr_ngroups);
>+	if (ret < 0) {
>+		groups = realloc(groups, cred->cr_ngroups*sizeof(gid_t));
>+		ret = nfs4_gss_princ_to_grouplist(secname, name,
>+				groups, &cred->cr_ngroups);
>+		if (ret < 0)
>+			cred->cr_ngroups = 0;
>+		else {
>+			if (cred->cr_ngroups > NGROUPS)
>+				cred->cr_ngroups = NGROUPS;
>+			memcpy(cred->cr_groups, groups,
>+					cred->cr_ngroups*sizeof(gid_t));
>+		}
>+	}
>+}
>+
> static int
> get_ids(gss_name_t client_name, gss_OID mech, struct svc_cred *cred)
> {
>@@ -172,6 +195,7 @@ get_ids(gss_name_t client_name, gss_OID 
> 	uid_t		uid, gid;
> 	gss_OID		name_type;
> 	char		*secname;
>+	gid_t		*groups;
> 
> 	maj_stat = gss_display_name(&min_stat, client_name, &name, &name_type);
> 	if (maj_stat != GSS_S_COMPLETE)
>@@ -190,8 +214,7 @@ get_ids(gss_name_t client_name, gss_OID 
> 		goto out_free;
> 	cred->cr_uid = uid;
> 	cred->cr_gid = gid;
>-	/*XXX: want add_supplementary_groups(secname, sname, cred)? */
>-	cred->cr_ngroups = 0;
>+	add_supplementary_groups(secname, sname, cred);
> 	res = 0;
> out_free:
> 	free(sname);
>_

Actions: View | Diff

Attachments on bug 221518: 144850