[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Wed Oct 10 21:11:03 MDT 2012


The branch, master has been updated
       via  547a260 vfs: Improve formatting of vfs_fake_acls
       via  d07d888 vfs: Improve formatting of vfs_default
       via  a581b3d examples: Re-indent and reformat skel VFS modules
       via  38416cc vfs: Use a blocking function in vfs_zfsacl for system ACL blobs
       via  bac3ed2 vfs: Use posix_sys_acl_blob_get_file in vfs_tru64acl for posix ACLs
       via  998bdd5 vfs: Use posix_sys_acl_blob_get_file in vfs_solarisacl for posix ACLs
       via  010e589 vfs: Use posix_sys_acl_blob_get_file in vfs_posixacl for posix ACLs
       via  598b565c vfs: Use posix_sys_acl_blob_get_file in vfs_irix for posix ACLs
       via  4eb0e40 vfs: Use posix_sys_acl_blob_get_file in vfs_hpux for posix ACLs
       via  abee79f vfs: Use posix_sys_acl_blob_get_file in vfs_gpfs for posix ACLs
       via  5dddd94 vfs: Use posix_sys_acl_blob_get_file in vfs_fake_acls for posix ACLs
       via  76b38f7 vfs: Use posix_sys_acl_blob_get_file in vfs_default for posix ACLs
       via  274ace3 vfs: Use posix_sys_acl_blob_get_file in vfs_aixacl2 for posix ACLs
       via  79edc54 vfs: Use posix_sys_acl_blob_get_file in vfs_aixacl
       via  c960a49 vfs: Use a blocking function in vfs_afsacl for system ACL blobs
       via  ddcaac9 vfs: Implement a sys_acl_blob_get_{fd,file} for POSIX ACL backends
       via  1f36ec1 vfs: Remove type parameter from sys_acl_blob_get_{fd,file}
       via  c8ade07 smbd: Add mem_ctx to {f,}get_nt_acl VFS call
       via  9158974 smbd: Add mem_ctx to sys_acl_init() and all callers
       via  a4d1f22 build: Add vfs_media_harmony to the waf build
       via  bb99cf1 posixacls: Add IDL changes for vfs_acl_xattr using hash of the sys acl
      from  5bb60df s3-rpc_server: fix build warning

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 547a260a2865d547a4ffc756b21fa648349654fd
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Oct 11 10:47:17 2012 +1100

    vfs: Improve formatting of vfs_fake_acls
    
    This avoids this bad style being copied into new modules.
    
    Andrew Bartlett
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Thu Oct 11 05:10:16 CEST 2012 on sn-devel-104

commit d07d888ce1394c51019804d5717e02d088a715f8
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Oct 11 10:46:37 2012 +1100

    vfs: Improve formatting of vfs_default
    
    This avoids this bad style being copied into new modules.
    
    Andrew Bartlett

commit a581b3d48edb1b3f8205e5b1dd2935e265aaba42
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Oct 11 07:53:29 2012 +1100

    examples: Re-indent and reformat skel VFS modules
    
    This avoids some of the poor style here from propogating to new VFS modules.
    
    Andrew Bartlett

commit 38416ccac3970b2bf63fe218ef85d535d848302c
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 17:00:42 2012 +1100

    vfs: Use a blocking function in vfs_zfsacl for system ACL blobs
    
    This is so we do not query some other module for the ACL blob, as zfs
    ACLs are not posix ACLs.  We may add a linearisation later.
    
    Andrew Bartlett

commit bac3ed2696e621ee18f4332e5404bbf2af0c7ccb
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 16:59:53 2012 +1100

    vfs: Use posix_sys_acl_blob_get_file in vfs_tru64acl for posix ACLs

commit 998bdd516adf5edb5c5884f92f04dc690aa1ce27
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 16:59:43 2012 +1100

    vfs: Use posix_sys_acl_blob_get_file in vfs_solarisacl for posix ACLs

commit 010e589c29335fc48446051347d6af5f787981a4
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 16:59:35 2012 +1100

    vfs: Use posix_sys_acl_blob_get_file in vfs_posixacl for posix ACLs

commit 598b565c632aae8792dc2917eda2e2b7365d4cec
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 16:59:25 2012 +1100

    vfs: Use posix_sys_acl_blob_get_file in vfs_irix for posix ACLs

commit 4eb0e406f15c5fcf3b73361978edcac0a8db5b58
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 16:59:18 2012 +1100

    vfs: Use posix_sys_acl_blob_get_file in vfs_hpux for posix ACLs

commit abee79f99db802adc8e13a2baedf7817bf937786
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 16:58:59 2012 +1100

    vfs: Use posix_sys_acl_blob_get_file in vfs_gpfs for posix ACLs

commit 5dddd9429e9b08b3d88ed6ba8fc86ec837ef23d8
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 16:53:43 2012 +1100

    vfs: Use posix_sys_acl_blob_get_file in vfs_fake_acls for posix ACLs

commit 76b38f75e98ed68de9e649c2a0ef3b4b317292ae
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 16:53:22 2012 +1100

    vfs: Use posix_sys_acl_blob_get_file in vfs_default for posix ACLs

commit 274ace37fd413240bac3d5f45fa9a481aba0bfb1
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 16:52:17 2012 +1100

    vfs: Use posix_sys_acl_blob_get_file in vfs_aixacl2 for posix ACLs

commit 79edc54a94b9a42df86130174faf010010a05f82
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 16:52:02 2012 +1100

    vfs: Use posix_sys_acl_blob_get_file in vfs_aixacl

commit c960a49f428d8e5030bd61c42095786406184b99
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 16:45:44 2012 +1100

    vfs: Use a blocking function in vfs_afsacl for system ACL blobs
    
    This is important, as we need to avoid asking any lower module for a
    possible libear ACL blob.  We may implement a linearisation in the
    future.
    
    Andrew Bartlett

commit ddcaac99f0262909be57eceac4535bd3684096b3
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 16:49:59 2012 +1100

    vfs: Implement a sys_acl_blob_get_{fd,file} for POSIX ACL backends
    
    This simply linearlises the SMB_ACL_T (default and access acl for
    directories) and the file owner, group and mode into a blob.
    
    It will be useful for an improved vfs_acl_common.c that uses this sets
    that, rather than the hash of the NT ACL, in the xattr
    
    This will in turn insulate the stored hash from changes in the ACL
    mapping.
    
    Andrew Bartlett

commit 1f36ec129300e4f69efe26d4950fe3a7cfbfb233
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 16:44:41 2012 +1100

    vfs: Remove type parameter from sys_acl_blob_get_{fd,file}
    
    This interface actually needs to match the get_nt_acl interface in
    that the system ACL implmenetation may not be posix ACLs, and the blob
    is not meant to be enforced to be of a particular system ACL
    structure.
    
    Andrew Bartlett

commit c8ade07760ae0ccfdf2d875c9f3027926e62321b
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 11:50:27 2012 +1100

    smbd: Add mem_ctx to {f,}get_nt_acl VFS call
    
    This makes it clear which context the returned SD is allocated on, as
    a number of callers do not want it on talloc_tos().
    
    As the ACL transformation allocates and then no longer needs a great
    deal of memory, a talloc_stackframe() call is used to contain the
    memory that is not returned further up the stack.
    
    Andrew Bartlett

commit 9158974540d0e311021f04789ed75ebda466c5b3
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 10:18:32 2012 +1100

    smbd: Add mem_ctx to sys_acl_init() and all callers
    
    This changes from allocation on NULL to allocation on the supplied
    memory context.
    
    Currently that supplied context is talloc_tos() at the the final consumer of
    the ACL.
    
    Andrew Bartlett

commit a4d1f2223abdb0db2a15742ebd59a611cc157443
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 12:44:14 2012 +1100

    build: Add vfs_media_harmony to the waf build

commit bb99cf1f729b789290202e573ea3dcedf2f253a0
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 10 16:42:38 2012 +1100

    posixacls: Add IDL changes for vfs_acl_xattr using hash of the sys acl
    
    This will isolate the hash of the ACL from any intermediate mapping that
    the POSIX -> NT mapping subsystem might need to do, and which might
    change if we need to correct that mapping.
    
    Andrew Bartlett

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

Summary of changes:
 examples/VFS/skel_opaque.c                |  327 ++++++++++++--------
 examples/VFS/skel_transparent.c           |  487 ++++++++++++++++-------------
 librpc/idl/smb_acl.idl                    |   20 ++-
 librpc/idl/xattr.idl                      |   13 +
 source3/Makefile.in                       |    2 +-
 source3/include/smb_acls.h                |    8 +-
 source3/include/vfs.h                     |   29 ++-
 source3/include/vfs_macros.h              |   40 ++--
 source3/lib/sysacls.c                     |   12 +-
 source3/modules/nfs4_acls.c               |   18 +-
 source3/modules/nfs4_acls.h               |    2 +
 source3/modules/vfs_acl_common.c          |   68 +++--
 source3/modules/vfs_afsacl.c              |   34 ++-
 source3/modules/vfs_aixacl.c              |    2 +
 source3/modules/vfs_aixacl2.c             |   63 ++++-
 source3/modules/vfs_aixacl_util.c         |    4 +-
 source3/modules/vfs_aixacl_util.h         |    2 +-
 source3/modules/vfs_cap.c                 |    6 +-
 source3/modules/vfs_catia.c               |    8 +-
 source3/modules/vfs_default.c             |   69 +++--
 source3/modules/vfs_fake_acls.c           |   91 +-----
 source3/modules/vfs_full_audit.c          |   24 +-
 source3/modules/vfs_gpfs.c                |   96 +++++-
 source3/modules/vfs_hpuxacl.c             |   19 +-
 source3/modules/vfs_irixacl.c             |    2 +
 source3/modules/vfs_media_harmony.c       |   22 +-
 source3/modules/vfs_posixacl.c            |   17 +-
 source3/modules/vfs_posixacl.h            |    6 +-
 source3/modules/vfs_shadow_copy2.c        |   11 +-
 source3/modules/vfs_solarisacl.c          |   14 +-
 source3/modules/vfs_time_audit.c          |   21 +-
 source3/modules/vfs_tru64acl.c            |   20 +-
 source3/modules/vfs_zfsacl.c              |   30 ++-
 source3/modules/wscript_build             |    9 +
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c |   16 +-
 source3/smbd/file_access.c                |    4 +-
 source3/smbd/nttrans.c                    |   13 +-
 source3/smbd/open.c                       |   22 +-
 source3/smbd/posix_acls.c                 |  206 +++++++++++--
 source3/smbd/proto.h                      |   15 +-
 source3/smbd/pysmbd.c                     |   40 ++--
 source3/smbd/trans2.c                     |   12 +-
 source3/smbd/vfs.c                        |   19 +-
 source3/torture/cmd_vfs.c                 |   12 +-
 44 files changed, 1234 insertions(+), 721 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index a786a23..6948d64 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -21,7 +21,6 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "../source3/include/includes.h"
 
 /* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE 
@@ -32,7 +31,8 @@
  * you must re-implement every function.
  */
 
-static int skel_connect(vfs_handle_struct *handle,  const char *service, const char *user)    
+static int skel_connect(vfs_handle_struct *handle, const char *service,
+			const char *user)
 {
 	errno = ENOSYS;
 	return -1;
@@ -43,9 +43,9 @@ static void skel_disconnect(vfs_handle_struct *handle)
 	;
 }
 
-static uint64_t skel_disk_free(vfs_handle_struct *handle,  const char *path,
-	bool small_query, uint64_t *bsize,
-	uint64_t *dfree, uint64_t *dsize)
+static uint64_t skel_disk_free(vfs_handle_struct *handle, const char *path,
+			       bool small_query, uint64_t *bsize,
+			       uint64_t *dfree, uint64_t *dsize)
 {
 	*bsize = 0;
 	*dfree = 0;
@@ -53,31 +53,38 @@ static uint64_t skel_disk_free(vfs_handle_struct *handle,  const char *path,
 	return 0;
 }
 
-static int skel_get_quota(vfs_handle_struct *handle,  enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dq)
+static int skel_get_quota(vfs_handle_struct *handle, enum SMB_QUOTA_TYPE qtype,
+			  unid_t id, SMB_DISK_QUOTA *dq)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static int skel_set_quota(vfs_handle_struct *handle,  enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dq)
+static int skel_set_quota(vfs_handle_struct *handle, enum SMB_QUOTA_TYPE qtype,
+			  unid_t id, SMB_DISK_QUOTA *dq)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, struct 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;
 }
 
-static int skel_statvfs(struct vfs_handle_struct *handle, const char *path, struct vfs_statvfs_struct *statbuf)
+static int skel_statvfs(struct vfs_handle_struct *handle,
+			const char *path, struct vfs_statvfs_struct *statbuf)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static uint32_t skel_fs_capabilities(struct vfs_handle_struct *handle, enum timestamp_set_resolution *p_ts_res)
+static uint32_t skel_fs_capabilities(struct vfs_handle_struct *handle,
+				     enum timestamp_set_resolution *p_ts_res)
 {
 	return 0;
 }
@@ -88,29 +95,30 @@ static NTSTATUS skel_get_dfs_referrals(struct vfs_handle_struct *handle,
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-static DIR *skel_opendir(vfs_handle_struct *handle,  const char *fname, const char *mask, uint32 attr)
+static DIR *skel_opendir(vfs_handle_struct *handle, const char *fname,
+			 const char *mask, uint32 attr)
 {
 	return NULL;
 }
 
-static DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)
+static DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp,
+			   const char *mask, uint32 attr)
 {
 	return NULL;
 }
 
 static struct dirent *skel_readdir(vfs_handle_struct *handle,
-				       DIR *dirp,
-				       SMB_STRUCT_STAT *sbuf)
+				   DIR *dirp, SMB_STRUCT_STAT *sbuf)
 {
 	return NULL;
 }
 
-static void skel_seekdir(vfs_handle_struct *handle,  DIR *dirp, long offset)
+static void skel_seekdir(vfs_handle_struct *handle, DIR *dirp, long offset)
 {
 	;
 }
 
-static long skel_telldir(vfs_handle_struct *handle,  DIR *dirp)
+static long skel_telldir(vfs_handle_struct *handle, DIR *dirp)
 {
 	return (long)-1;
 }
@@ -120,19 +128,19 @@ static void skel_rewind_dir(vfs_handle_struct *handle, DIR *dirp)
 	;
 }
 
-static int skel_mkdir(vfs_handle_struct *handle,  const char *path, mode_t mode)
+static int skel_mkdir(vfs_handle_struct *handle, const char *path, mode_t mode)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static int skel_rmdir(vfs_handle_struct *handle,  const char *path)
+static int skel_rmdir(vfs_handle_struct *handle, const char *path)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static int skel_closedir(vfs_handle_struct *handle,  DIR *dir)
+static int skel_closedir(vfs_handle_struct *handle, DIR *dir)
 {
 	errno = ENOSYS;
 	return -1;
@@ -151,21 +159,20 @@ static int skel_open(vfs_handle_struct *handle, struct smb_filename *smb_fname,
 }
 
 static NTSTATUS skel_create_file(struct vfs_handle_struct *handle,
-                                struct smb_request *req,
-                                uint16_t root_dir_fid,
-                                struct smb_filename *smb_fname,
-                                uint32_t access_mask,
-                                uint32_t share_access,
-                                uint32_t create_disposition,
-                                uint32_t create_options,
-                                uint32_t file_attributes,
-                                uint32_t oplock_request,
-                                uint64_t allocation_size,
-				uint32_t private_flags,
-                                struct security_descriptor *sd,
-                                struct ea_list *ea_list,
-                                files_struct **result,
-                                int *pinfo)
+				 struct smb_request *req,
+				 uint16_t root_dir_fid,
+				 struct smb_filename *smb_fname,
+				 uint32_t access_mask,
+				 uint32_t share_access,
+				 uint32_t create_disposition,
+				 uint32_t create_options,
+				 uint32_t file_attributes,
+				 uint32_t oplock_request,
+				 uint64_t allocation_size,
+				 uint32_t private_flags,
+				 struct security_descriptor *sd,
+				 struct ea_list *ea_list,
+				 files_struct **result, int *pinfo)
 {
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
@@ -176,13 +183,15 @@ static int skel_close_fn(vfs_handle_struct *handle, files_struct *fsp)
 	return -1;
 }
 
-static ssize_t skel_vfs_read(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n)
+static ssize_t skel_vfs_read(vfs_handle_struct *handle, files_struct *fsp,
+			     void *data, size_t n)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n, off_t offset)
+static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp,
+			  void *data, size_t n, off_t offset)
 {
 	errno = ENOSYS;
 	return -1;
@@ -203,13 +212,15 @@ static ssize_t skel_pread_recv(struct tevent_req *req, int *err)
 	return -1;
 }
 
-static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n)
+static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp,
+			  const void *data, size_t n)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n, off_t offset)
+static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp,
+			   const void *data, size_t n, off_t offset)
 {
 	errno = ENOSYS;
 	return -1;
@@ -231,19 +242,23 @@ static ssize_t skel_pwrite_recv(struct tevent_req *req, int *err)
 	return -1;
 }
 
-static off_t skel_lseek(vfs_handle_struct *handle, files_struct *fsp, off_t offset, int whence)
+static off_t skel_lseek(vfs_handle_struct *handle, files_struct *fsp,
+			off_t offset, int whence)
 {
 	errno = ENOSYS;
-	return (off_t)-1;
+	return (off_t) - 1;
 }
 
-static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *hdr, off_t offset, size_t n)
+static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd,
+			     files_struct *fromfsp, const DATA_BLOB *hdr,
+			     off_t offset, size_t n)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, off_t offset, size_t n)
+static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd,
+			     files_struct *tofsp, off_t offset, size_t n)
 {
 	errno = ENOSYS;
 	return -1;
@@ -283,19 +298,23 @@ static int skel_stat(vfs_handle_struct *handle, struct smb_filename *smb_fname)
 	return -1;
 }
 
-static int skel_fstat(vfs_handle_struct *handle, files_struct *fsp, SMB_STRUCT_STAT *sbuf)
+static int skel_fstat(vfs_handle_struct *handle, files_struct *fsp,
+		      SMB_STRUCT_STAT *sbuf)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static int skel_lstat(vfs_handle_struct *handle, struct smb_filename *smb_fname)
+static int skel_lstat(vfs_handle_struct *handle,
+		      struct smb_filename *smb_fname)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static uint64_t skel_get_alloc_size(struct vfs_handle_struct *handle, struct files_struct *fsp, const SMB_STRUCT_STAT *sbuf)
+static uint64_t skel_get_alloc_size(struct vfs_handle_struct *handle,
+				    struct files_struct *fsp,
+				    const SMB_STRUCT_STAT *sbuf)
 {
 	errno = ENOSYS;
 	return -1;
@@ -308,37 +327,41 @@ static int skel_unlink(vfs_handle_struct *handle,
 	return -1;
 }
 
-static int skel_chmod(vfs_handle_struct *handle,  const char *path, mode_t mode)
+static int skel_chmod(vfs_handle_struct *handle, const char *path, mode_t mode)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static int skel_fchmod(vfs_handle_struct *handle, files_struct *fsp, mode_t mode)
+static int skel_fchmod(vfs_handle_struct *handle, files_struct *fsp,
+		       mode_t mode)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static int skel_chown(vfs_handle_struct *handle,  const char *path, uid_t uid, gid_t gid)
+static int skel_chown(vfs_handle_struct *handle, const char *path,
+		      uid_t uid, gid_t gid)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static int skel_fchown(vfs_handle_struct *handle, files_struct *fsp, uid_t uid, gid_t gid)
+static int skel_fchown(vfs_handle_struct *handle, files_struct *fsp,
+		       uid_t uid, gid_t gid)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static int skel_lchown(vfs_handle_struct *handle,  const char *path, uid_t uid, gid_t gid)
+static int skel_lchown(vfs_handle_struct *handle, const char *path,
+		       uid_t uid, gid_t gid)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static int skel_chdir(vfs_handle_struct *handle,  const char *path)
+static int skel_chdir(vfs_handle_struct *handle, const char *path)
 {
 	errno = ENOSYS;
 	return -1;
@@ -358,86 +381,99 @@ static int skel_ntimes(vfs_handle_struct *handle,
 	return -1;
 }
 
-static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, off_t offset)
+static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp,
+			  off_t offset)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
 static int skel_fallocate(vfs_handle_struct *handle, files_struct *fsp,
-			enum vfs_fallocate_mode mode,
-			off_t offset, off_t len)
+			  enum vfs_fallocate_mode mode, off_t offset, off_t len)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, off_t offset, off_t count, int type)
+static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op,
+		      off_t offset, off_t count, int type)
 {
 	errno = ENOSYS;
 	return false;
 }
 
-static int skel_kernel_flock(struct vfs_handle_struct *handle, struct files_struct *fsp, uint32 share_mode, uint32 access_mask)
+static int skel_kernel_flock(struct vfs_handle_struct *handle,
+			     struct files_struct *fsp,
+			     uint32 share_mode, uint32 access_mask)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static int skel_linux_setlease(struct vfs_handle_struct *handle, struct files_struct *fsp, int leasetype)
+static int skel_linux_setlease(struct vfs_handle_struct *handle,
+			       struct files_struct *fsp, int leasetype)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static bool skel_getlock(vfs_handle_struct *handle, files_struct *fsp, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid)
+static bool skel_getlock(vfs_handle_struct *handle, files_struct *fsp,
+			 off_t *poffset, off_t *pcount, int *ptype,
+			 pid_t *ppid)
 {
 	errno = ENOSYS;
 	return false;
 }
 
-static int skel_symlink(vfs_handle_struct *handle,  const char *oldpath, const char *newpath)
+static int skel_symlink(vfs_handle_struct *handle, const char *oldpath,
+			const char *newpath)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static int skel_vfs_readlink(vfs_handle_struct *handle, const char *path, char *buf, size_t bufsiz)
+static int skel_vfs_readlink(vfs_handle_struct *handle, const char *path,
+			     char *buf, size_t bufsiz)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static int skel_link(vfs_handle_struct *handle,  const char *oldpath, const char *newpath)
+static int skel_link(vfs_handle_struct *handle, const char *oldpath,
+		     const char *newpath)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static int skel_mknod(vfs_handle_struct *handle,  const char *path, mode_t mode, SMB_DEV_T dev)
+static int skel_mknod(vfs_handle_struct *handle, const char *path, mode_t mode,
+		      SMB_DEV_T dev)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
-static char *skel_realpath(vfs_handle_struct *handle,  const char *path)
+static char *skel_realpath(vfs_handle_struct *handle, const char *path)
 {
 	errno = ENOSYS;
 	return NULL;
 }
 
 static NTSTATUS skel_notify_watch(struct vfs_handle_struct *handle,
-	    struct sys_notify_context *ctx,
-	    const char *path,
-	    uint32_t *filter,
-	    uint32_t *subdir_filter,
-	    void (*callback)(struct sys_notify_context *ctx, void *private_data, struct notify_event *ev),
-	    void *private_data, void *handle_p)
+				  struct sys_notify_context *ctx,
+				  const char *path,
+				  uint32_t *filter,
+				  uint32_t *subdir_filter,
+				  void (*callback) (struct sys_notify_context *
+						    ctx, void *private_data,
+						    struct notify_event *ev),
+				  void *private_data, void *handle_p)
 {
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-static int skel_chflags(vfs_handle_struct *handle,  const char *path, uint flags)
+static int skel_chflags(vfs_handle_struct *handle, const char *path,
+			uint flags)
 {
 	errno = ENOSYS;
 	return -1;
@@ -463,221 +499,252 @@ static NTSTATUS skel_streaminfo(struct vfs_handle_struct *handle,
 }
 
 static int skel_get_real_filename(struct vfs_handle_struct *handle,
-				const char *path,
-				const char *name,
-				TALLOC_CTX *mem_ctx,
-				char **found_name)
+				  const char *path,
+				  const char *name,
+				  TALLOC_CTX *mem_ctx, char **found_name)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
 static const char *skel_connectpath(struct vfs_handle_struct *handle,
-				const char *filename)
+				    const char *filename)
 {
 	errno = ENOSYS;
 	return NULL;
 }
 
 static NTSTATUS skel_brl_lock_windows(struct vfs_handle_struct *handle,
-				struct byte_range_lock *br_lck,
-				struct lock_struct *plock,
-				bool blocking_lock,
-				struct blocking_lock_record *blr)
+				      struct byte_range_lock *br_lck,
+				      struct lock_struct *plock,
+				      bool blocking_lock,
+				      struct blocking_lock_record *blr)
 {
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static bool skel_brl_unlock_windows(struct vfs_handle_struct *handle,
-				struct messaging_context *msg_ctx,
-				struct byte_range_lock *br_lck,
-				const struct lock_struct *plock)
+				    struct messaging_context *msg_ctx,
+				    struct byte_range_lock *br_lck,
+				    const struct lock_struct *plock)
 {
 	errno = ENOSYS;
 	return false;
 }
 
 static bool skel_brl_cancel_windows(struct vfs_handle_struct *handle,
-				struct byte_range_lock *br_lck,
-				struct lock_struct *plock,
-				struct blocking_lock_record *blr)
+				    struct byte_range_lock *br_lck,
+				    struct lock_struct *plock,
+				    struct blocking_lock_record *blr)
 {
 	errno = ENOSYS;
 	return false;
 }
 
 static bool skel_strict_lock(struct vfs_handle_struct *handle,
-				struct files_struct *fsp,
-				struct lock_struct *plock)
+			     struct files_struct *fsp,
+			     struct lock_struct *plock)
 {


-- 
Samba Shared Repository


More information about the samba-cvs mailing list