[SCM] Samba Shared Repository - branch master updated - c044b09572631cbdd686e5dbbdfbcc731145533a

[Volker Lendecke]

The branch, master has been updated
       via  c044b09572631cbdd686e5dbbdfbcc731145533a (commit)
      from  3c93c96fd0fe362c35fe8127058f94868abc9342 (commit)

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


- Log -----------------------------------------------------------------
commit c044b09572631cbdd686e5dbbdfbcc731145533a
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Wed Dec 10 16:58:40 2008 +0100

    Fix the build
    
    Crap, too many trees and no instant, infinitely fast rebuild

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

Summary of changes:
 source3/include/proto.h    |    4 ++++
 source3/modules/vfs_gpfs.c |    9 ---------
 2 files changed, 4 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4feedcd..7fa6266 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 780bd9b..fae08dd 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 },


-- 
Samba Shared Repository