diff options
| author | Volker Lendecke <vl@samba.org> | 2008-12-10 16:58:40 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-12-10 19:02:11 +0100 |
| commit | c044b09572631cbdd686e5dbbdfbcc731145533a (patch) | |
| tree | 4677a8b487c8dc4737c6fd4be1c21b578a9392dc | |
| parent | 3c93c96fd0fe362c35fe8127058f94868abc9342 (diff) | |
| download | samba-c044b09572631cbdd686e5dbbdfbcc731145533a.tar.gz samba-c044b09572631cbdd686e5dbbdfbcc731145533a.tar.bz2 samba-c044b09572631cbdd686e5dbbdfbcc731145533a.zip | |
Fix the build
Crap, too many trees and no instant, infinitely fast rebuild
| -rw-r--r-- | source3/include/proto.h | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_gpfs.c | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 4feedcdb04..7fa6266910 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -7896,6 +7896,10 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx, char **pp_saved_last_component, SMB_STRUCT_STAT *pst); NTSTATUS check_name(connection_struct *conn, const char *name); +int get_real_filename(connection_struct *conn, const char *path, + const char *name, TALLOC_CTX *mem_ctx, + char **found_name); + /* The following definitions come from smbd/files.c */ diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 780bd9b8a5..fae08dd252 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -446,11 +446,6 @@ static NTSTATUS gpfsacl_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp return gpfsacl_set_nt_acl_internal(fsp, security_info_sent, psd); } -static NTSTATUS gpfsacl_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, char *name, uint32 security_info_sent, SEC_DESC *psd) -{ - return gpfsacl_set_nt_acl_internal(fsp, security_info_sent, psd); -} - static SMB_ACL_T gpfs2smb_acl(const struct gpfs_acl *pacl) { SMB_ACL_T result; @@ -895,10 +890,6 @@ static vfs_op_tuple gpfs_op_tuples[] = { SMB_VFS_OP_FSET_NT_ACL, SMB_VFS_LAYER_TRANSPARENT }, - { SMB_VFS_OP(gpfsacl_set_nt_acl), - SMB_VFS_OP_SET_NT_ACL, - SMB_VFS_LAYER_TRANSPARENT }, - { SMB_VFS_OP(gpfsacl_sys_acl_get_file), SMB_VFS_OP_SYS_ACL_GET_FILE, SMB_VFS_LAYER_TRANSPARENT }, |