Attachment 6658 Details for Bug 8281 – bug fix

[patch] bug fix

examples-vfs-fix-in-reference-to-shadow_copy-changes.patch (text/plain), 5.35 KB, created by Björn Baumbach on 2011-07-01 10:23:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2011-07-01 10:23:32 UTC

Size: 5.35 KB

patch

obsolete

>From ad7bd1fdb097b920b2124c40952a0a6ff4c61b03 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Wed, 29 Jun 2011 16:57:27 +0200
>Subject: [PATCH 1/4] examples/VFS: fix skel_transparent.c in reference to shadow_copy changes
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 576cb574a15158a33feab48be3c5ed05721f28fc)
>---
> examples/VFS/skel_transparent.c |    3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
>diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
>index f06e02a..37e6a70 100644
>--- a/examples/VFS/skel_transparent.c
>+++ b/examples/VFS/skel_transparent.c
>@@ -23,6 +23,7 @@
> 
> 
> #include "includes.h"
>+#include "smbd/proto.h"
> 
> /* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE 
>    SAMBA DEVELOPERS GUIDE!!!!!!
>@@ -64,7 +65,7 @@ static int skel_set_quota(vfs_handle_struct *handle,  enum SMB_QUOTA_TYPE qtype,
> 	return SMB_VFS_NEXT_SET_QUOTA(handle, qtype, id, dq);
> }
> 
>-static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
>+static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, struct shadow_copy_data *shadow_copy_data, bool labels)
> {
> 	return SMB_VFS_NEXT_GET_SHADOW_COPY_DATA(handle, fsp, shadow_copy_data, labels);
> }
>-- 
>1.7.3.4
>
>
>From 86eb48ae0ba1c4c89aae2be22b62a31b4881cef9 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Wed, 29 Jun 2011 16:56:45 +0200
>Subject: [PATCH 2/4] examples/VFS: fix skel_opaque.c in reference to shadow_copy changes
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 776672805c35bb2db760194730c46b96019e0da1)
>---
> examples/VFS/skel_opaque.c |    3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
>diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
>index f60f0fe..7b422b2 100644
>--- a/examples/VFS/skel_opaque.c
>+++ b/examples/VFS/skel_opaque.c
>@@ -23,6 +23,7 @@
> 
> 
> #include "includes.h"
>+#include "smbd/proto.h"
> 
> /* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE 
>    SAMBA DEVELOPERS GUIDE!!!!!!
>@@ -65,7 +66,7 @@ static int skel_set_quota(vfs_handle_struct *handle,  enum SMB_QUOTA_TYPE qtype,
> 	return -1;
> }
> 
>-static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
>+static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, struct shadow_copy_data *shadow_copy_data, bool labels)
> {
> 	errno = ENOSYS;
> 	return -1;
>-- 
>1.7.3.4
>
>
>From b2a9eb92cd01e50d6dad2b9c906ba87a6e10af9e Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Fri, 1 Jul 2011 11:53:02 +0200
>Subject: [PATCH 3/4] examples/VFS: prepare shadow_copy_test.c for fix in reference to shadow_copy changes
>
>---
> examples/VFS/shadow_copy_test.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/examples/VFS/shadow_copy_test.c b/examples/VFS/shadow_copy_test.c
>index fab7007..d4da238 100644
>--- a/examples/VFS/shadow_copy_test.c
>+++ b/examples/VFS/shadow_copy_test.c
>@@ -59,7 +59,7 @@ static int test_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fs
> 	
> 	if (labels) {	
> 		if (num) {
>-			shadow_copy_data->labels = TALLOC_ZERO_ARRAY(shadow_copy_data->mem_ctx,SHADOW_COPY_LABEL,num);
>+			shadow_copy_data->labels = talloc_zero_array(shadow_copy_data->mem_ctx,SHADOW_COPY_LABEL,num);
> 		} else {
> 			shadow_copy_data->labels = NULL;
> 		}
>-- 
>1.7.3.4
>
>
>From f925979f8fd2c6e36d60a5d042fcf6f6139cdae6 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Wed, 29 Jun 2011 16:53:57 +0200
>Subject: [PATCH 4/4] examples/VFS: fix shadow_copy_test.c in reference to shadow_copy changes
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 6930afc9f4e613a660bbe716e849f5db7276491c)
>---
> examples/VFS/shadow_copy_test.c |   13 ++++++++++---
> 1 files changed, 10 insertions(+), 3 deletions(-)
>
>diff --git a/examples/VFS/shadow_copy_test.c b/examples/VFS/shadow_copy_test.c
>index d4da238..a47d2ee 100644
>--- a/examples/VFS/shadow_copy_test.c
>+++ b/examples/VFS/shadow_copy_test.c
>@@ -19,6 +19,8 @@
>  */
> 
> #include "includes.h"
>+#include "ntioctl.h"
>+#include "smbd/proto.h"
> 
> #undef DBGC_CLASS
> #define DBGC_CLASS DBGC_VFS
>@@ -50,7 +52,10 @@
> 	  Directories are always displayed...    
> */
> 
>-static int test_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
>+static int test_get_shadow_copy_data(vfs_handle_struct *handle,
>+				    files_struct *fsp,
>+				    struct shadow_copy_data *shadow_copy_data,
>+				    bool labels)
> {
> 	uint32 num = 3;
> 	uint32 i;
>@@ -59,7 +64,7 @@ static int test_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fs
> 	
> 	if (labels) {	
> 		if (num) {
>-			shadow_copy_data->labels = talloc_zero_array(shadow_copy_data->mem_ctx,SHADOW_COPY_LABEL,num);
>+			shadow_copy_data->labels = talloc_zero_array(shadow_copy_data,SHADOW_COPY_LABEL,num);
> 		} else {
> 			shadow_copy_data->labels = NULL;
> 		}
>@@ -81,5 +86,7 @@ static struct vfs_fn_pointers vfs_test_shadow_copy_fns = {
> 
> NTSTATUS vfs_shadow_copy_test_init(void)
> {
>-	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "shadow_copy_test", &vfs_test_shadow_copy_fns);
>+	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
>+				"shadow_copy_test",
>+				&vfs_test_shadow_copy_fns);
> }
>-- 
>1.7.3.4
>

Flags:

bjacke: review+
obnox: review-

Actions: View

Attachments on bug 8281: 6658 | 6659 | 6660