Attachment 311196 Details for Bug 454160 – Patch proposed upstream, still pending verification

[patch] Patch proposed upstream, still pending verification

0001-Group-memebrs-need-to-respect-lp_winbindd_default_do.patch (text/plain), 1.57 KB, created by Simo Sorce on 2008-07-07 17:36:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simo Sorce

Created: 2008-07-07 17:36:16 UTC

Size: 1.57 KB

patch

obsolete

>From 5b59f228979072eb3884c18a0de0a520e9330ef5 Mon Sep 17 00:00:00 2001
>From: Simo Sorce <idra@samba.org>
>Date: Sun, 6 Jul 2008 13:55:34 -0400
>Subject: [PATCH] Group memebrs need to respect lp_winbindd_default_domain() as well
> or group memebrships break.
>
>---
> source/winbindd/winbindd_group.c |   26 +++++++++++++++++++++++++-
> 1 files changed, 25 insertions(+), 1 deletions(-)
>
>diff --git a/source/winbindd/winbindd_group.c b/source/winbindd/winbindd_group.c
>index 69e3a6a..e309244 100644
>--- a/source/winbindd/winbindd_group.c
>+++ b/source/winbindd/winbindd_group.c
>@@ -469,6 +469,30 @@ static NTSTATUS expand_groups( TALLOC_CTX *ctx,
> 	return status;
> }
> 
>+static void parse_add_domuser(void *buf, char *domuser, int *len)
>+{
>+	fstring domain;
>+	char *p, *user;
>+
>+	user = domuser;
>+	p = strchr(domuser, *lp_winbind_separator());
>+
>+	if (p) {
>+
>+		fstrcpy(domain, domuser);
>+		domain[PTR_DIFF(p, domuser)] = 0;
>+		p++;
>+
>+		if (assume_domain(domain)) {
>+
>+			user = p;
>+			*len -= (PTR_DIFF(p, domuser));
>+		}
>+	}
>+
>+	safe_strcpy(buf, user, *len);
>+}
>+
> /***********************************************************************
>  Fill in the group membership field of a NT group given by group_sid
> ***********************************************************************/
>@@ -606,7 +630,7 @@ static bool fill_grent_mem(struct winbindd_domain *domain,
> 		} else {
> 			DEBUG(10, ("appending %s at ndx %d\n",
> 				   names[i], buf_ndx));
>-			safe_strcpy(&buf[buf_ndx], names[i], len);
>+			parse_add_domuser(&buf[buf_ndx], names[i], &len);
> 			buf_ndx += len;
> 			buf[buf_ndx] = ',';
> 			buf_ndx++;
>-- 
>1.5.4.3
>

Actions: View | Diff

Attachments on bug 454160: 311196