Attachment 3725 Details for Bug 5889 – Patch for 3.2.x.

[patch] Patch for 3.2.x.

look (text/plain), 974 bytes, created by Jeremy Allison on 2008-11-11 16:20:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2008-11-11 16:20:15 UTC

Size: 974 bytes

patch

obsolete

>diff --git a/source/smbd/reply.c b/source/smbd/reply.c
>index 2d271ab..7aeefea 100644
>--- a/source/smbd/reply.c
>+++ b/source/smbd/reply.c
>@@ -5046,8 +5046,16 @@ NTSTATUS rmdir_internals(TALLOC_CTX *ctx,
> 			}
> 		}
> 
>-		/* We only have veto files/directories. Recursive delete. */
>+		/* We only have veto files/directories.
>+		 * Are we allowed to delete them ? */
> 
>+		if(!lp_recursive_veto_delete(SNUM(conn))) {
>+			TALLOC_FREE(dir_hnd);
>+			errno = ENOTEMPTY;
>+			goto err;
>+		}
>+
>+		/* Do a recursive delete. */
> 		RewindDir(dir_hnd,&dirpos);
> 		while ((dname = ReadDirName(dir_hnd,&dirpos))) {
> 			char *fullname = NULL;
>@@ -5073,9 +5081,8 @@ NTSTATUS rmdir_internals(TALLOC_CTX *ctx,
> 				break;
> 			}
> 			if(st.st_mode & S_IFDIR) {
>-				if(lp_recursive_veto_delete(SNUM(conn))) {
>-					if(!recursive_rmdir(ctx, conn, fullname))
>-						break;
>+				if(!recursive_rmdir(ctx, conn, fullname)) {
>+					break;
> 				}
> 				if(SMB_VFS_RMDIR(conn,fullname) != 0) {
> 					break;

Actions: View

Attachments on bug 5889: 3725