Attachment 6832 Details for Bug 8422 – git-am fix for 3.5.x.

[patch] git-am fix for 3.5.x.

0001-Fix-bug-Bug-8422-Infinite-loop-in-ACL-module-code.patch (text/plain), 1.04 KB, created by Jeremy Allison on 2011-08-29 23:53:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-08-29 23:53:59 UTC

Size: 1.04 KB

patch

obsolete

>From fd892c3dd5c17e8e11b7e169fddb65d38870d965 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Mon, 29 Aug 2011 16:53:04 -0700
>Subject: [PATCH] Fix bug Bug 8422 - Infinite loop in ACL module code.
>
>Missing assignment means this loop will never terminate. Need to be applied
>to 3.5.x and 3.6.1.
>---
> source3/modules/vfs_acl_common.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
>index b209824..af4c41d 100644
>--- a/source3/modules/vfs_acl_common.c
>+++ b/source3/modules/vfs_acl_common.c
>@@ -862,7 +862,7 @@ static int acl_common_remove_object(vfs_handle_struct *handle,
> 
> 	/* Ensure we have this file open with DELETE access. */
> 	id = vfs_file_id_from_sbuf(conn, &local_fname.st);
>-	for (fsp = file_find_di_first(id); fsp; file_find_di_next(fsp)) {
>+	for (fsp = file_find_di_first(id); fsp; fsp = file_find_di_next(fsp)) {
> 		if (fsp->access_mask & DELETE_ACCESS &&
> 				fsp->delete_on_close) {
> 			/* We did open this for delete,
>-- 
>1.7.3.1
>

Flags:

vl: review+

Actions: View

Attachments on bug 8422: 6832 | 6833