Attachment 6899 Details for Bug 7589 – Fix for Samba (winbind) 3.4.7

[patch] Fix for Samba (winbind) 3.4.7

patch0.patch (text/plain), 1.33 KB, created by Susana Pereira on 2011-09-16 19:57:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Susana Pereira

Created: 2011-09-16 19:57:20 UTC

Size: 1.33 KB

patch

obsolete

>diff --git a/winbindd_pam.c b/winbindd_pam.c
>index 765fb0d..1ff745a 100644
>--- a/winbindd_pam.c
>+++ b/winbindd_pam.c
>@@ -812,7 +812,7 @@ 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, mapped_user;
>+	fstring name_domain, name_user;
> 	char *mapped = NULL;
> 	NTSTATUS result;
> 	NTSTATUS name_map_status = NT_STATUS_UNSUCCESSFUL;
>@@ -839,17 +839,18 @@ void winbindd_pam_auth(struct winbindd_cli_state *state)
> 					       state->request.data.auth.user,
> 					       &mapped);
> 
>-	/* If the name normalization didnt' actually do anything,
>-	   just use the original name */
>+	
>+	/* Update the auth name if we did any mapping */
>+
>+	if (NT_STATUS_IS_OK(name_map_status) ||
>+	    NT_STATUS_EQUAL(name_map_status, NT_STATUS_FILE_RENAMED))
>+	{
>+		fstrcpy(state->request.data.auth.user, mapped);
>+ 	}
>+ 
> 
>-	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)) {
>+	if (!canonicalize_username(state->request.data.auth.user, name_domain, name_user)) {
> 		result = NT_STATUS_NO_SUCH_USER;
> 		goto done;
> 	}

Actions: View

Attachments on bug 7589: 5877 | 6899