Fix the build

Crap, too many trees and no instant, infinitely fast rebuild

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4feedcdb04e7d579f0a7253447df8c3440da65fc..7fa626691039bb5492dc97ba8df8843cd4d0052f 100644 (file)
--- 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 780bd9b8a56fa6e81a15045a6ae9f4a5952233e0..fae08dd25236e6b755d39a797e048a568b642666 100644 (file)
--- 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 },