[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  46cae09 Fix the examples/VFS build. (cherry picked from commit 
79c6f0d440b30d2c36a50a8ea5735a5a1818b551)
      from  3d1069f Fix examples/VFS to use correct prototypes for is_offline() 
and set_offline(). (cherry picked from commit 
0faffd4556438f7add6312e58acca345abfbe7fb)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 46cae09a39be98bee77345afd0adbf62621421f5
Author: Jeremy Allison <j...@samba.org>
Date:   Mon Mar 7 04:46:20 2011 -0800

    Fix the examples/VFS build.
    (cherry picked from commit 79c6f0d440b30d2c36a50a8ea5735a5a1818b551)

-----------------------------------------------------------------------

Summary of changes:
 examples/VFS/skel_opaque.c      |    6 +++---
 examples/VFS/skel_transparent.c |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index c7350e2..ef7c3af 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -477,19 +477,19 @@ static NTSTATUS skel_translate_name(struct 
vfs_handle_struct *handle,
 }
 
 static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-       uint32 security_info, SEC_DESC **ppdesc)
+       uint32 security_info, struct security_descriptor **ppdesc)
 {
        return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle,
-       const char *name, uint32 security_info, SEC_DESC **ppdesc)
+       const char *name, uint32 security_info, struct security_descriptor 
**ppdesc)
 {
        return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-       uint32 security_info_sent, const SEC_DESC *psd)
+       uint32 security_info_sent, const struct security_descriptor *psd)
 {
        return NT_STATUS_NOT_IMPLEMENTED;
 }
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index ed55c20..403e28d 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -298,7 +298,7 @@ static int skel_ftruncate(vfs_handle_struct *handle, 
files_struct *fsp, SMB_OFF_
 }
 
 static int skel_fallocate(vfs_handle_struct *handle, files_struct *fsp,
-                       enum vfs_fallocate_mode,
+                       enum vfs_fallocate_mode mode,
                        SMB_OFF_T offset,
                        SMB_OFF_T len)
 {
@@ -468,19 +468,19 @@ static NTSTATUS skel_translate_name(struct 
vfs_handle_struct *handle,
 }
 
 static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-       uint32 security_info, SEC_DESC **ppdesc)
+       uint32 security_info, struct security_descriptor **ppdesc)
 {
        return SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, ppdesc);
 }
 
 static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle,
-       const char *name, uint32 security_info, SEC_DESC **ppdesc)
+       const char *name, uint32 security_info, struct security_descriptor 
**ppdesc)
 {
        return SMB_VFS_NEXT_GET_NT_ACL(handle, name, security_info, ppdesc);
 }
 
 static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-       uint32 security_info_sent, const SEC_DESC *psd)
+       uint32 security_info_sent, const struct security_descriptor *psd)
 {
        return SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
 }


-- 
Samba Shared Repository