Attachment 9486 Details for Bug 10286 – Patch for master v2

[patch] Patch for master v2

0001-s3-lib-Fix-G-subtituion-for-domain-users-in-smbd.patch (text/plain), 1.13 KB, created by Andreas Schneider on 2013-11-27 16:22:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2013-11-27 16:22:06 UTC

Size: 1.13 KB

patch

obsolete

>From 755b185fe97ee595e17f045bbf9e278c3115a52d Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Wed, 27 Nov 2013 17:21:01 +0100
>Subject: [PATCH] s3-lib: Fix %G subtituion for domain users in smbd.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10286
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/lib/substitute.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
>diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
>index ca2ac79..937f02c 100644
>--- a/source3/lib/substitute.c
>+++ b/source3/lib/substitute.c
>@@ -499,10 +499,20 @@ char *talloc_sub_basic(TALLOC_CTX *mem_ctx,
> 			break;
> 		case 'G' : {
> 			struct passwd *pass;
>-			r = talloc_strdup(tmp_ctx, smb_name);
>+
>+			if (domain_name != NULL && domain_name[0] != '\0') {
>+				r = talloc_asprintf(tmp_ctx,
>+						    "%s%c%s",
>+						    domain_name,
>+						    *lp_winbind_separator(),
>+						    smb_name);
>+			} else {
>+				r = talloc_strdup(tmp_ctx, smb_name);
>+			}
> 			if (r == NULL) {
> 				goto error;
> 			}
>+
> 			pass = Get_Pwnam_alloc(tmp_ctx, r);
> 			if (pass != NULL) {
> 				a_string = realloc_string_sub(
>-- 
>1.8.4.3
>

Actions: View

Attachments on bug 10286: 9461 | 9486 | 9522 | 9523 | 11784