Attachment 14247 Details for Bug 12851 – additional patch for 4.7 and 4.8

[patch] additional patch for 4.7 and 4.8

0001-s3-winbind-Fix-regression-introduced-with-bso-12851.patch (text/plain), 1.93 KB, created by Andreas Schneider on 2018-06-21 05:15:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2018-06-21 05:15:34 UTC

Size: 1.93 KB

patch

obsolete

>From 397dd46fa3864d3b694b6cca1149b2154baf60c7 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Wed, 20 Jun 2018 11:38:28 +0200
>Subject: [PATCH] s3:winbind: Fix regression introduced with bso #12851
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12851
>
>Pair-Programmed-With: Guenther Deschner <gd@samba.org>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Signed-off-by: Guenther Deschner <gd@samba.org>
>(cherry picked from commit c1c764925e24788905ab91aa455b415765d6f71f)
>---
> source3/winbindd/wb_getpwsid.c | 28 ++++++++++------------------
> 1 file changed, 10 insertions(+), 18 deletions(-)
>
>diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c
>index 8e114abf965..8dc09eb513d 100644
>--- a/source3/winbindd/wb_getpwsid.c
>+++ b/source3/winbindd/wb_getpwsid.c
>@@ -101,25 +101,17 @@ static void wb_getpwsid_queryuser_done(struct tevent_req *subreq)
> 				    info->domain_name,
> 				    acct_name,
> 				    &mapped_name);
>-	if (NT_STATUS_IS_OK(status)) {
>-		output_username = fill_domain_username_talloc(state,
>-				     info->domain_name,
>-				     mapped_name, true);
>-		if (output_username == NULL) {
>-			tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
>-			return;
>-		}
>+	if (NT_STATUS_IS_OK(status) ||
>+	    NT_STATUS_EQUAL(status, NT_STATUS_FILE_RENAMED)) {
> 		fstrcpy(acct_name, mapped_name);
>-	} else if (NT_STATUS_EQUAL(status, NT_STATUS_FILE_RENAMED)) {
>-		fstrcpy(acct_name, mapped_name);
>-	} else {
>-		output_username = fill_domain_username_talloc(state,
>-				     info->domain_name,
>-				     acct_name, true);
>-		if (output_username == NULL) {
>-			tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
>-			return;
>-		}
>+	}
>+	output_username = fill_domain_username_talloc(state,
>+						      info->domain_name,
>+						      acct_name,
>+						      true);
>+	if (output_username == NULL) {
>+		tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
>+		return;
> 	}
> 
> 	strlcpy(pw->pw_name, output_username, sizeof(pw->pw_name));
>-- 
>2.17.1
>

Flags:

gd: review+

Actions: View

Attachments on bug 12851: 13299 | 14247