[SCM] Samba Shared Repository - branch v3-6-test updated
Karolin Seeger
kseeger at samba.org
Mon Jul 4 13:38:31 MDT 2011
The branch, v3-6-test has been updated
via f28ec1d s3:build: add vfs_examples to the everything target
via 737a1c9 s3:build: add a vfs_examples target.
via d57a510 examples/VFS: fix skel_transparent.c in reference to shadow_copy changes
via 180749b examples/VFS: fix skel_opaque.c in reference to shadow_copy changes
via e21d132 examples/VFS: fix shadow_copy_test.c in reference to shadow_copy changes
from 97055ce s3-winbind: Fix bug 7888 -- deal with buggy 3.0 based PDCs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit f28ec1da9e51d53f4e93a23088a7c7c4ab2c109f
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 30 15:15:22 2011 +0200
s3:build: add vfs_examples to the everything target
So that one can not pass autobuild without keeping the vfs examples intact.
Autobuild-User: Michael Adam <obnox at samba.org>
Autobuild-Date: Thu Jun 30 16:52:48 CEST 2011 on sn-devel-104
The last 5 patches address bug #8281 (examples/VFS/* does not build).
commit 737a1c9b96a4ba8d8688f4dba1df6d931e10e64d
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 30 13:54:52 2011 +0200
s3:build: add a vfs_examples target.
commit d57a51093e526d7aac05f3d210ab7aee5e2036aa
Author: Björn Baumbach <bb at sernet.de>
Date: Wed Jun 29 16:57:27 2011 +0200
examples/VFS: fix skel_transparent.c in reference to shadow_copy changes
Signed-off-by: Michael Adam <obnox at samba.org>
commit 180749b898c4491e04c2a11d4b39b2833e3602e6
Author: Björn Baumbach <bb at sernet.de>
Date: Wed Jun 29 16:56:45 2011 +0200
examples/VFS: fix skel_opaque.c in reference to shadow_copy changes
Signed-off-by: Michael Adam <obnox at samba.org>
commit e21d132cc98abe03247f91b27b098ec83b8d08e2
Author: Björn Baumbach <bb at sernet.de>
Date: Wed Jun 29 16:53:57 2011 +0200
examples/VFS: fix shadow_copy_test.c in reference to shadow_copy changes
Signed-off-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
examples/VFS/shadow_copy_test.c | 13 ++++++++++---
examples/VFS/skel_opaque.c | 3 ++-
examples/VFS/skel_transparent.c | 3 ++-
source3/Makefile.in | 14 +++++++++++++-
4 files changed, 27 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/VFS/shadow_copy_test.c b/examples/VFS/shadow_copy_test.c
index fab7007..4a9e64f 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);
}
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;
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);
}
diff --git a/source3/Makefile.in b/source3/Makefile.in
index ff05d02..485de6a 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1612,7 +1612,8 @@ idl_full::
everything:: all libtalloc libsmbclient libnetapi debug2html smbfilter talloctort replacetort smbconftort modules torture \
- $(EVERYTHING_PROGS)
+ $(EVERYTHING_PROGS) \
+ vfs_examples
.SUFFIXES:
.SUFFIXES: .c .o .lo
@@ -3542,3 +3543,14 @@ bin/smbtorture4: $(BINARY_PREREQS)
bin/ndrdump4: $(BINARY_PREREQS)
$(MAKE) -f Makefile-smbtorture4 bin/ndrdump4
+
+.PHONY: vfs_examples
+
+vfs_examples:
+ ( \
+ cd ../examples/VFS && \
+ ./autogen.sh && \
+ ./configure && \
+ make clean && \
+ make \
+ )
--
Samba Shared Repository
More information about the samba-cvs
mailing list