Attachment 4829 Details for Bug 6793 – Patch for 3.4

[patch] Patch for 3.4

0001-s3-winbind-Fix-bug-6793-segfault-in-winbindd_pam.patch (text/plain), 1.58 KB, created by Volker Lendecke on 2009-10-09 15:05:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2009-10-09 15:05:15 UTC

Size: 1.58 KB

patch

obsolete

>From b53c103aff6381d080ba81b8bd512a61d94dccd5 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Fri, 9 Oct 2009 22:05:37 +0200
>Subject: [PATCH] s3:winbind: Fix bug 6793 -- segfault in winbindd_pam_auth
>
>---
> source3/winbindd/winbindd_pam.c |   13 ++++++-------
> 1 files changed, 6 insertions(+), 7 deletions(-)
>
>diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
>index dbf6f5b..1064ec5 100644
>--- a/source3/winbindd/winbindd_pam.c
>+++ b/source3/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,14 @@ 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);
> 	}
> 
> 	if (!canonicalize_username(mapped_user, name_domain, name_user)) {
>-- 
>1.6.0.4
>

Actions: View

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