Attachment 4845 Details for Bug 6793 – git-am patch for 3.3.9

[patch] git-am patch for 3.3.9

0001-s3-winbind-Fix-bug-6793-segfault-in-winbindd_pam.patch (text/plain), 1.64 KB, created by Jeremy Allison on 2009-10-14 13:48:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2009-10-14 13:48:06 UTC

Size: 1.64 KB

patch

obsolete

>From 309f0b1387466cced7b4ef2dc3792a30525931f3 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Wed, 14 Oct 2009 11:37:10 -0700
>Subject: [PATCH] s3:winbind: Fix bug 6793 -- segfault in winbindd_pam_auth
>
>---
> source/winbindd/winbindd_pam.c |   15 ++++++++-------
> 1 files changed, 8 insertions(+), 7 deletions(-)
>
>diff --git a/source/winbindd/winbindd_pam.c b/source/winbindd/winbindd_pam.c
>index d33fc26..646bef3 100644
>--- a/source/winbindd/winbindd_pam.c
>+++ b/source/winbindd/winbindd_pam.c
>@@ -810,8 +810,8 @@ static NTSTATUS append_data(struct winbindd_cli_state *state,
> void winbindd_pam_auth(struct winbindd_cli_state *state)
> {
> 	struct winbindd_domain *domain;
>-	fstring name_domain, name_user;
>-	char *mapped_user = NULL;
>+	fstring name_domain, name_user, mapped_user;
>+	char *mapped = NULL;
> 	NTSTATUS result;
> 	NTSTATUS name_map_status = NT_STATUS_UNSUCCESSFUL;
> 
>@@ -835,15 +835,16 @@ void winbindd_pam_auth(struct winbindd_cli_state *state)
> 
> 	name_map_status = normalize_name_unmap(state->mem_ctx,
> 					       state->request.data.auth.user,
>-					       &mapped_user);
>+					       &mapped);
> 
> 	/* If the name normalization didnt' actually do anything,
> 	   just use the original name */
> 
>-	if (!NT_STATUS_IS_OK(name_map_status) &&
>-	    !NT_STATUS_EQUAL(name_map_status, NT_STATUS_FILE_RENAMED))
>-	{
>-		mapped_user = state->request.data.auth.user;
>+	if (NT_STATUS_IS_OK(name_map_status)
>+	    ||NT_STATUS_EQUAL(name_map_status, NT_STATUS_FILE_RENAMED)) {
>+		fstrcpy(mapped_user, mapped);
>+	} else {
>+		fstrcpy(mapped_user, state->request.data.auth.user);
> 	}
> 
> 	if (!canonicalize_username(mapped_user, name_domain, name_user)) {
>-- 
>1.5.4.3
>

Flags:

vl: review+
gd: review+

Actions: View

Attachments on bug 6793: 4821 | 4825 | 4829 | 4835 | 4836 | 4837 | 4844 | 4845 | 4854